sq

Dockerfile

@@ -1,6 +1,12 @@
 FROM debian:bullseye-slim
 
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates curl \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
 ARG beacon_binary
+RUN if [ -z "$beacon_binary" ]; then echo "ERROR: beacon_binary build argument is required" >&2; exit 1; fi
 ADD ${beacon_binary} /app/beacon
 
 WORKDIR /app

test_docker.sh

@@ -8,16 +8,25 @@ set -o pipefail  # Fail if any part of a pipeline fails
 echo "Starting Beacon test."
 echo "---------------------"
 
-DOCKER_BUILDKIT=1 docker compose build beacon
-echo "Build successful."
-echo "-----------------"
+# BEACON_BINARY not set
+if [ -z "$BEACON_BINARY" ]; then 
+    echo "Building Beacon binary..."
+    echo "---------------------"
+    go build .
+    BEACON_BINARY=./beacon
+fi
+
+echo "Building Docker image..."
+echo "---------------------"
+DOCKER_BUILDKIT=1 docker build --build-arg beacon_binary=${BEACON_BINARY} -t beacon-test .
 
 # try to read env file, but ignore it if it does not exist
 # in CI the env will be set without this file
-source ~/beacon.github.env || true
+source ~/beacon.github.env || echo "Ignore missing file in CI"
 
-docker compose run --rm \
- -T \
+echo "Running test..."
+echo "---------------------"
+docker run --rm \
  --entrypoint bash \
  -e BEACON_EMAIL_SMTP_SERVER=${BEACON_EMAIL_SMTP_SERVER} \
  -e BEACON_EMAIL_SMTP_PORT=${BEACON_EMAIL_SMTP_PORT} \
@@ -26,7 +35,7 @@ docker compose run --rm \
  -e BEACON_EMAIL_SEND_TO=${BEACON_EMAIL_SEND_TO} \
  -e BEACON_EMAIL_SENDER=${BEACON_EMAIL_SENDER} \
  -e BEACON_EMAIL_PREFIX='[staging]' \
- beacon -c '
+ beacon-test -c '
 set -e
 /app/beacon start &
 echo "executing POST"