Add entrypoint.sh scripts to allow replacing binaries in containers directly

containers/agent/Dockerfile

@@ -25,11 +25,11 @@ ENV DEBIAN_FRONTEND=noninteractive
 ARG CODEQL_VERSION=latest
 
 # Install packages
-RUN apt-get update && apt-get install --no-install-recommends --assume-yes \
-    unzip \
-    curl \
-    ca-certificates \
-    default-jdk
+RUN echo 'Acquire::http::Proxy "http://127.0.0.1:3142";' \
+    > /etc/apt/apt.conf.d/01proxy && \
+    apt-get update && apt-get install --no-install-recommends --assume-yes \
+    unzip curl ca-certificates default-jdk && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # If the version is 'latest', lsget the latest release version from GitHub, unzip the bundle into /opt, and delete the archive
 RUN if [ "$CODEQL_VERSION" = "latest" ]; then \
@@ -51,6 +51,9 @@ ENV CODEQL_JAVA_HOME=/usr
 # Copy the built binary from the builder stage
 COPY --from=builder /app/mrvaagent-binary /usr/local/bin/mrvaagent
 
-# Run the agent with the default mode set to container
-ENTRYPOINT ["/usr/local/bin/mrvaagent"]
+# Copy the binary-replacement support script to the container
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+
+# Run the agent with the default mode set to container
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 

containers/agent/Makefile

@@ -7,7 +7,7 @@ mrvaagent.tmp:
 MAG_TARGET := mrva-agent:0.1.24
 mag: mk.mrvaagent
 mk.mrvaagent: mrvaagent.tmp
-	docker build --no-cache -t ${MAG_TARGET} .
+	docker build --no-cache --network host -t ${MAG_TARGET} .
 	touch $@
 
 magserve: mag

containers/agent/README.org

@@ -3,23 +3,37 @@
     #+BEGIN_SRC sh 
       # Build the container via
       cd ~/work-gh/mrva/mrva-docker/containers/agent/
-      make mk.mrvaagent
 
-      # Run the container in standalone mode via
+      MAG_TARGET=mrva-agent:0.1.24
+      docker build --no-cache --network host -t ${MAG_TARGET} .
+
+      # Run bash in the container in standalone mode
       cd ~/work-gh/mrva/mrva-docker/containers/agent/
-      make magserve
+      docker run --env-file ../../.env.container --rm -it \
+             --entrypoint /bin/bash \
+             ${MAG_TARGET}
+      '
+      ls /usr/local/bin/
+      entrypoint.sh  mrvaagent
+      '
+    #+END_SRC
+
+  - Tag the container.  This is sufficient for further use on the local machine.
+    #+BEGIN_SRC sh
+      docker tag ${MAG_TARGET} ghcr.io/hohn/${MAG_TARGET}
     #+END_SRC
 
   - Push this container
     #+BEGIN_SRC sh
-      # Push container
-      cd ~/work-gh/mrva/mrva-docker/containers/agent/
-      make mk.mag-push
+      docker push ghcr.io/hohn/${MAG_TARGET}
     #+END_SRC
 
   - Test the registry image
     #+BEGIN_SRC sh
       # Test pushed container
-      make mag-test
+      docker pull ghcr.io/hohn/${MAG_TARGET}
+      docker run --env-file ../../.env.container --rm -it \
+             --entrypoint /bin/bash \
+             ${MAG_TARGET}
     #+END_SRC
     

containers/agent/entrypoint.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# Function to handle termination signals (e.g., SIGTERM)
+cleanup() {
+    echo "Stopping agent..."
+    kill $PID
+    wait $PID 2>/dev/null
+    exit 0
+}
+
+# Trap termination signals to clean up properly
+trap cleanup SIGTERM SIGINT
+
+# Loop to restart the agent if it stops
+while true; do
+    echo "Starting agent..."
+    /usr/local/bin/mrvaagent &
+    PID=$!
+    wait $PID
+    echo "Agent stopped. Restarting..."
+    sleep 1
+done