Add base-image env-var to Dockerfile

cyber-dojo · Oct 2, 2023 · 5cee400 · 5cee400
1 parent 7d0dd9b
commit 5cee400
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/sources/client/Dockerfile b/sources/client/Dockerfile
@@ -1,11 +1,17 @@
-FROM cyberdojo/sinatra-base:08fbd2d
+ARG BASE_IMAGE=cyberdojo/sinatra-base:6b753be
+FROM ${BASE_IMAGE}
 LABEL maintainer=jon@jaggersoft.com
 
 WORKDIR /app
 COPY --chown=nobody:nogroup . .
 
 ARG COMMIT_SHA
 ENV SHA=${COMMIT_SHA}
+ENV COMMIT_SHA=${COMMIT_SHA}
+
+# ARGs are reset after FROM See https://github.com/moby/moby/issues/34129
+ARG BASE_IMAGE
+ENV BASE_IMAGE=${BASE_IMAGE}
 
 USER nobody
 HEALTHCHECK --interval=1s --timeout=1s --retries=5 --start-period=5s CMD /app/config/healthcheck.sh

diff --git a/sources/server/Dockerfile b/sources/server/Dockerfile
@@ -1,11 +1,17 @@
-FROM cyberdojo/sinatra-base:08fbd2d
+ARG BASE_IMAGE=cyberdojo/sinatra-base:6b753be
+FROM ${BASE_IMAGE}
 LABEL maintainer=jon@jaggersoft.com
 
 WORKDIR /app
 COPY --chown=nobody:nogroup . .
 
 ARG COMMIT_SHA
 ENV SHA=${COMMIT_SHA}
+ENV COMMIT_SHA=${COMMIT_SHA}
+
+# ARGs are reset after FROM See https://github.com/moby/moby/issues/34129
+ARG BASE_IMAGE
+ENV BASE_IMAGE=${BASE_IMAGE}
 
 USER nobody
 HEALTHCHECK --interval=1s --timeout=1s --retries=5 --start-period=5s CMD /app/config/healthcheck.sh