From 38a3f1a16b2e10fe7377731c869ae8729a4379bf Mon Sep 17 00:00:00 2001
From: david-i-berry <dberry@wmo.int>
Date: Thu, 22 Aug 2024 10:43:05 +0200
Subject: [PATCH] Swap from ENV to ARG for USER_ID - build time variable used
 to set uid for user.

Additional statements in test-docker.yml to set vars.
---
 .github/workflows/test-docker.yml | 4 ++++
 docker/Dockerfile                 | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index 76cf402..df6c62f 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -18,6 +18,8 @@ jobs:
       - name: Build test environment
         working-directory: docker/tests
         run: |
+          DOCKER_GID="$(getent group docker | cut -d: -f3)"
+          export DOCKER_GID          
           # create user for wis2downloader
           sudo usermod -aG docker "$(whoami)"
           docker compose build  # build containers
@@ -78,4 +80,6 @@ jobs:
       - name: Shutdown
         working-directory: docker/tests
         run: |
+          DOCKER_GID="$(getent group docker | cut -d: -f3)"
+          export DOCKER_GID          
           docker compose down
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d5eafb7..7759e5a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.12-slim-bookworm
+ARG USER_ID=12135
 
 SHELL ["/bin/bash", "-c"]
-
 # default ENV / config
 ENV DOWNLOAD_BROKER_HOST "globalbroker.meteo.fr"
 ENV DOWNLOAD_BROKER_PORT 443
@@ -15,7 +15,7 @@ ENV DOWNLOAD_VALIDATE_TOPICS "false"
 ENV DOWNLOAD_WORKERS 8
 ENV LOG_PATH "/home/wis2downloader/app/logs"
 ENV WIS2DOWNLOADER_CONFIG "/home/wis2downloader/app/config/config.json"
-ENV USER_ID 12135
+
 
 # Update, upgrade packages and install / clean up
 RUN apt-get update && \