Only one docker run script to run them all

Author: Pedrobc89

Makefile

@@ -29,28 +29,28 @@ build-image:
 	@bash -x src/scripts/docker_image_build.sh
 
 build-all: build-image
-	@bash -x src/scripts/build.sh scripts/bazel_build.sh
+	@bash -x src/scripts/run.sh scripts/bazel_build.sh
 
 run-query-agent:
-	@bash -x src/scripts/run.sh query_broker 31700
+	@bash -x src/scripts/run.sh bin/query_broker 31700
 
 run-attention-broker:
-	@bash -x src/scripts/run.sh attention_broker_service 37007
+	@bash -x src/scripts/run.sh bin/attention_broker_service 37007
 
 run-link-creation-agent:
-	@bash -x src/scripts/run.sh link_creation_server $(OPTIONS)
+	@bash -x src/scripts/run.sh bin/link_creation_server $(OPTIONS)
 
 run-link-creation-client:
-	@bash -x src/scripts/run.sh link_creation_agent_client $(OPTIONS)
+	@bash -x src/scripts/run.sh bin/link_creation_agent_client $(OPTIONS)
 
 run-inference-agent:
-	@bash -x src/scripts/run.sh inference_agent_server $(OPTIONS)
+	@bash -x src/scripts/run.sh bin/inference_agent_server $(OPTIONS)
 
 run-inference-agent-client:
-	@bash -x src/scripts/run.sh inference_agent_client $(OPTIONS)
+	@bash -x src/scripts/run.sh bin/inference_agent_client $(OPTIONS)
 
 run-evolution:
-	@bash ./src/scripts/bazel.sh ./scripts/bazel_cmd.sh run //evolution:main -- $(OPTIONS)
+	@bash src/scripts/run.sh scripts/bazel_cmd.sh run //evolution:main -- $(OPTIONS)
 
 run-das-agent:
 	@bash ./src/scripts/bazel.sh run //das_agent:main -- $(OPTIONS)
@@ -64,14 +64,14 @@ setup-nunet-dms:
 reset-nunet-dms:
 	@bash -x src/scripts/reset-nunet-dms.sh
 
-bazel: build-image
-	@bash ./src/scripts/bazel.sh $(filter-out $@, $(MAKECMDGOALS))
+bazel:
+	@bash -x src/scripts/run.sh scripts/bazel_cmd.sh $(filter-out $@, $(MAKECMDGOALS))
 
 test-all-no-cache:
 	@$(MAKE) bazel 'test --cache_test_results=no //tests/...'
 
 test-all: build-image
-	@$(MAKE) bazel test //tests/...
+	@$(MAKE) bazel 'test //tests/...'
 
 lint-all:
 	@$(MAKE) bazel lint \

src/scripts/run.sh

@@ -1,24 +1,50 @@
 #!/bin/bash
 
-CONTAINER_NAME="$1"
-shift
+set -exou pipefail
+
+IMAGE_NAME="das-builder"
 
 ENV_VARS=$(test -f .env && echo "--env-file=.env" || echo "")
 
+# Ensure an entrypoint is provided
+if [ -z "$1" ]; then
+    echo "Usage: $0 <entrypoint>"
+    exit 1
+fi
+
+ENTRYPOINT="$1"
+shift
+
+# local paths
+LOCAL_WORKDIR=$(pwd)
+LOCAL_BIN_DIR=$LOCAL_WORKDIR/src/bin
+LOCAL_CACHE="$HOME/.cache/das"
+
+mkdir -p "$LOCAL_BIN_DIR" "$LOCAL_CACHE" 
+
+# container paths
+CONTAINER_WORKDIR=/opt/das
+CONTAINER_WORKSPACE_DIR=/opt/das/src
+CONTAINER_BIN_DIR=$CONTAINER_WORKSPACE_DIR/bin
+CONTAINER_CACHE=/home/"${USER}"/.cache
+
+CONTAINER_NAME=$(echo "$ENTRYPOINT" | sed 's/[\/.]/_/g' | sed 's/_sh$//')
+
 if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
   echo "Removing existing container: ${CONTAINER_NAME}"
   docker rm -f "${CONTAINER_NAME}"
 fi
 
-mkdir -p bin
-docker run \
-    --name="$CONTAINER_NAME" \
-    --network host \
-    --volume .:/opt/das \
-    --workdir /opt/das \
-    $ENV_VARS \
-    das-builder \
-    "src/bin/$CONTAINER_NAME" "$@"
-
-sleep 1
-docker rm -f "$CONTAINER_NAME"
+docker run --rm \
+  --user="$(id -u)":"$(id -g)" \
+  --name=$CONTAINER_NAME \
+  -e BIN_DIR=$CONTAINER_BIN_DIR \
+  $ENV_VARS \
+  --network=host \
+  --volume /etc/passwd:/etc/passwd:ro \
+  --volume "$LOCAL_CACHE":"$CONTAINER_CACHE" \
+  --volume "$LOCAL_WORKDIR":"$CONTAINER_WORKDIR" \
+  --workdir "$CONTAINER_WORKSPACE_DIR" \
+  --entrypoint "${ENTRYPOINT}" \
+  "${IMAGE_NAME}" \
+  "${@}"