debug-init images: add support for non-root user mode (#980)

* debug-init images: add support non-root user mode

* README: add jq as a pre-req to running integ tests

Author: singholt

README.md

@@ -460,7 +460,7 @@ so AWS credentials must be setup before they are run.
 
 Instructions:
 1. Setup AWS access via EC2 instance role or AWS_* env vars
-2. Install dependent packages: `docker awscli`
+2. Install dependent packages: `docker awscli jq`
 3. Install docker-compose:
 ```
 sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose

scripts/dockerfiles/runtime/Dockerfile.init-debug

@@ -9,9 +9,18 @@ CMD echo "AWS for Fluent Bit Container Image Version `cat /AWS_FOR_FLUENT_BIT_VE
     if [ "$S3_KEY_PREFIX" == "issue" ]; then \
         echo "Note: Please set S3_KEY_PREFIX environment variable to a useful identifier - e.g. company name, team name, customer name"; \
     fi; \
-    /init/fluent_bit_init_process; \
-    chmod +x /init/invoke_fluent_bit.sh; \
     export RUN_ID=$(($RANDOM%99999))$(($RANDOM%99999))$(($RANDOM%99999)); \
     echo "RUN_ID is set to $RUN_ID"; \
-    env RUN_ID=$RUN_ID /init/invoke_fluent_bit.sh; \
+    /init/fluent_bit_init_process; \
+    # Source the invoke script from the appropriate location
+    if [ -f /init/invoke_fluent_bit.sh ]; then \
+        chmod +x /init/invoke_fluent_bit.sh; \
+        env RUN_ID=$RUN_ID /init/invoke_fluent_bit.sh; \
+    elif [ -f /tmp/init/invoke_fluent_bit.sh ]; then \
+        chmod +x /tmp/init/invoke_fluent_bit.sh; \
+        env RUN_ID=$RUN_ID /tmp/init/invoke_fluent_bit.sh; \
+    else \
+        echo "Error: invoke_fluent_bit.sh not found in /init or /tmp/init"; \
+        exit 1; \
+    fi; \
     /core_uploader.sh $S3_BUCKET $S3_KEY_PREFIX $RUN_ID

scripts/dockerfiles/runtime/Dockerfile.init-debug-efs

@@ -2,4 +2,16 @@ ARG RUNTIME_IMAGE
 FROM ${RUNTIME_IMAGE}
 
 # Only last CMD command will be executed, automatically replaces the original entrypoint
-CMD /init/fluent_bit_init_process; chmod +x /init/invoke_fluent_bit.sh; cd /cores; /init/invoke_fluent_bit.sh; echo "Waiting 2 minutes for EFS core file transfers"; sleep 120
+CMD /init/fluent_bit_init_process; \
+    # Source the invoke script from the appropriate location
+    if [ -f /init/invoke_fluent_bit.sh ]; then \
+        chmod +x /init/invoke_fluent_bit.sh; \
+        cd /cores; /init/invoke_fluent_bit.sh; \
+    elif [ -f /tmp/init/invoke_fluent_bit.sh ]; then \
+        chmod +x /tmp/init/invoke_fluent_bit.sh; \
+        cd /cores; /tmp/init/invoke_fluent_bit.sh; \
+    else \
+        echo "Error: invoke_fluent_bit.sh not found in /init or /tmp/init"; \
+        exit 1; \
+    fi; \
+    echo "Waiting 2 minutes for EFS core file transfers"; sleep 120