chore: parametrize RABBITMQ_START_TIMEOUT in scripts/test

Author: drodbar

.github/workflows/build_container.yml

@@ -1,4 +1,4 @@
-name: build_container
+name: build-container
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
 
-  build_container:
+  build_container_scratch:
 
     runs-on: ubuntu-latest
     steps:
@@ -17,5 +17,26 @@ jobs:
     - name: Run build_container to generate scratch image
       run: scripts/build_container -g scratch -e BASE_IMAGE=scratch
 
-    - name: Run test script
+  build_container_params:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Run build_container to generate and image using kaniko
+      run: scripts/build_container --tag kaniko --builder kaniko -t debug -e UID=1234 -e GID=5678
+
+    - name: Load rabbitmq-dump-queue:kaniko image
+      run: docker load -i image.tar
+
+    - name: Test container ids
+      run: docker run --rm --entrypoint= rabbitmq-dump-queue:kaniko /bin/id | grep --color=always '1234' | grep --color=always '5678'
+
+  build_container_test:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Run scripts/test
       run: scripts/test

scripts/build_container

@@ -43,8 +43,8 @@ build_with_kaniko() {
     ${DRY_RUN} docker run -w /build \
                -v "$PWD":/build \
                --rm \
-               "${BUILD_ARGS[@]}" \
                "${KANIKO_IMG}" \
+               "${BUILD_ARGS[@]}" \
                -d "${IMAGE_NAME}:${TAG}" \
                --target "${TARGET}" \
                --context . \

scripts/test

@@ -4,31 +4,41 @@ set -e
 
 DIRNAME="$(dirname "$(readlink -f "$0")")"
 
+: "${RABBITMQ_START_TIMEOUT:=30}"
+
 trap rm_containters EXIT
+trap errors_found ERR
+
+info_msg() { printf "[\033[34mINFO\033[0m] %b\n" "$*"; }
+error_msg() { printf "[\033[31mERROR\033[0m] %b\n" "$*"; }
 
 rm_containters() {
-    docker kill rdq-rabbitmq >/dev/null 2>&1
-    docker kill rdq-busybox >/dev/null 2>&1
-    docker kill rdq-test >/dev/null 2>&1
+    docker kill rdq-test >/dev/null 2>&1 || true
+    docker kill rdq-busybox >/dev/null 2>&1 || true
+    docker kill rdq-rabbitmq >/dev/null 2>&1 || true
+}
+
+errors_found() {
+    error_msg "$0 didn't finish correctly: rc [\033[31m$?\033[0m]"
 }
 
-# build docker image
-"${DIRNAME}/build_container" --target test \
-           >/dev/null 2>&1
+info_msg "Build rabbitmq-dump-queue test image"
+"${DIRNAME}/build_container" --target test >/dev/null 2>&1
 
-echo -e "[\033[34mINFO\033[0m] Start rabbitmq container"
+info_msg "Start rabbitmq container"
 docker run --network=host --rm -q \
            --detach \
            --name rdq-rabbitmq \
            rabbitmq:4-management >/dev/null
 
-echo -e "[\033[34mINFO\033[0m] Wait for rabbitmq listener"
+info_msg "Wait for rabbitmq listener up to [\033[32m${RABBITMQ_START_TIMEOUT}s\033[0m]"
 docker run --network=host --rm -q \
            --name rdq-busybox \
+           -e N="$RABBITMQ_START_TIMEOUT" \
            busybox \
-           sh -c 'nc -w 20 -z localhost 5672 >/dev/null'
+           sh -c 'while [ $N -ge 0 ]; do nc -z localhost 5672 >/dev/null && exit 0; sleep 1; N=$((N - 1)); done; exit 1'
 
-echo -e "[\033[34mINFO\033[0m] Run tests"
+info_msg "Run tests"
 docker run --network=host --rm \
            --name rdq-test\
            rabbitmq-dump-queue:test