From 1b97b111734c019a0688ead0b4475c9f9aaf8c7d Mon Sep 17 00:00:00 2001 From: Nicolas Duchon Date: Sun, 5 May 2024 11:19:56 +0200 Subject: [PATCH 1/2] test: use python:3-alpine as base for the web image --- test/requirements/web/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/requirements/web/Dockerfile b/test/requirements/web/Dockerfile index 923ed79..da75553 100644 --- a/test/requirements/web/Dockerfile +++ b/test/requirements/web/Dockerfile @@ -1,6 +1,7 @@ # Docker Image running one (or multiple) webservers listening on all given ports from WEB_PORTS environment variable -FROM python:3 +FROM python:3-alpine +RUN apk add --no-cache bash COPY ./webserver.py / COPY ./entrypoint.sh / WORKDIR /opt From 9a76577ebc301e8b9b1a2f300ee8cb29dcd42fc5 Mon Sep 17 00:00:00 2001 From: Nicolas Duchon Date: Sun, 5 May 2024 11:41:04 +0200 Subject: [PATCH 2/2] style: shellcheck linting --- test/requirements/web/entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/requirements/web/entrypoint.sh b/test/requirements/web/entrypoint.sh index 3015c11..be9f9c3 100644 --- a/test/requirements/web/entrypoint.sh +++ b/test/requirements/web/entrypoint.sh @@ -5,11 +5,11 @@ trap '[ ${#PIDS[@]} -gt 0 ] && kill -TERM ${PIDS[@]}' TERM declare -a PIDS for port in $WEB_PORTS; do - echo starting a web server listening on port $port; - /webserver.py $port & + echo starting a web server listening on port "$port"; + /webserver.py "$port" & PIDS+=($!) done -wait ${PIDS[@]} +wait "${PIDS[@]}" trap - TERM -wait ${PIDS[@]} +wait "${PIDS[@]}"