Adopt modern arg passing for build process

Author: Tom Notch

docker-compose.yml

@@ -2,6 +2,11 @@ services:
     todo-service-name:
         build:
             dockerfile: ./docker/${IMAGE_TAG}/Dockerfile
+            args:
+                BASE_IMAGE: ${BASE_IMAGE}
+                IMAGE_USER: ${IMAGE_USER}
+                HOME_FOLDER: ${HOME_FOLDER}
+                TIME_ZONE: ${TIME_ZONE}
             x-bake:
                 contexts:
                     home-folder-config: ./docker/build-context/home-folder-config

docker/latest/Dockerfile

@@ -1,5 +1,11 @@
 # Do not add --platform=linux/blabla since this is intended for multiplatform builds
+ARG BASE_IMAGE=ubuntu
 FROM ${BASE_IMAGE}
+
+ARG IMAGE_USER
+ARG HOME_FOLDER
+ARG TIME_ZONE
+
 ENV HOME=${HOME_FOLDER}
 WORKDIR ${HOME_FOLDER}/
 
@@ -66,9 +72,9 @@ RUN wget https://apt-get.kitware.com/kitware-archive.sh -O- | sh -s && \
     apt-get autoremove -y
 
 # # Add a new group and user
-# RUN addgroup --gid 1000 $IMAGE_USER && \
-#     adduser --uid 1000 --ingroup $IMAGE_USER --home ${HOME_FOLDER} --shell /bin/zsh --disabled-password --gecos "" $IMAGE_USER && \
-#     echo "$IMAGE_USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+# RUN addgroup --gid 1000 ${IMAGE_USER} && \
+#     adduser --uid 1000 --ingroup ${IMAGE_USER} --home ${HOME_FOLDER} --shell /bin/zsh --disabled-password --gecos "" ${IMAGE_USER} && \
+#     echo "${IMAGE_USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
 # # Fix UID/GID when mounting from host using this: https://github.com/boxboat/fixuid
 # RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - && \

scripts/build.sh

@@ -10,32 +10,10 @@
 
 set -euo pipefail
 
-before_env="$(mktemp)"
-after_env="$(mktemp)"
-tmp_dockerfile="$(mktemp)"
-cleanup() { rm -f "${before_env}" "${after_env}" "${tmp_dockerfile}"; }
-trap cleanup EXIT
-
-env | sort >"${before_env}"
-
 set -a
 . "$(dirname "$0")"/variables.sh
 set +a
 
-env | sort >"${after_env}"
-
-diff_env="$(
-	awk -F= '
-    NR==FNR { before[$1]=$0; next }
-    {
-      name=$1
-      if (!(name in before) || before[name] != $0)
-        printf " ${%s}", name
-    }
-  ' "${before_env}" "${after_env}"
-)"
-diff_env="${diff_env# }" # trim leading space
-
 # Determine the local platform
 if [[ "$(uname -m)" == "x86_64" ]]; then
 	LOCAL_PLATFORM="linux/amd64"
@@ -58,13 +36,5 @@ else
 	docker buildx use "${BUILDER}"
 fi
 
-# environment variable substitution trick
-envsubst "${diff_env}" <"$(dirname "$0")/../docker/${IMAGE_TAG}/Dockerfile" >"${tmp_dockerfile}"
-
-echo ">>> Substituted dockerfile:"
-echo "----------------------------------------"
-cat "${tmp_dockerfile}"
-echo "----------------------------------------"
-
 # Build the Docker image for only the local platform, push.sh will push multi-platform version
-docker buildx bake --file "$(dirname "$0")"/../docker-compose.yml --load --set "*.platform=${LOCAL_PLATFORM}" --set "*.dockerfile=${tmp_dockerfile}"
+docker buildx bake --file "$(dirname "$0")"/../docker-compose.yml --load --set "*.platform=${LOCAL_PLATFORM}"

scripts/push.sh

@@ -10,32 +10,10 @@
 
 set -euo pipefail
 
-before_env="$(mktemp)"
-after_env="$(mktemp)"
-tmp_dockerfile="$(mktemp)"
-cleanup() { rm -f "${before_env}" "${after_env}" "${tmp_dockerfile}"; }
-trap cleanup EXIT
-
-env | sort >"${before_env}"
-
 set -a
 . "$(dirname "$0")"/variables.sh
 set +a
 
-env | sort >"${after_env}"
-
-diff_env="$(
-	awk -F= '
-    NR==FNR { before[$1]=$0; next }
-    {
-      name=$1
-      if (!(name in before) || before[name] != $0)
-        printf " ${%s}", name
-    }
-  ' "${before_env}" "${after_env}"
-)"
-diff_env="${diff_env# }" # trim leading space
-
 # Check if the builder already exists
 if ! docker buildx inspect "${BUILDER}" &>/dev/null; then
 	echo "Creating Docker Buildx builder '${BUILDER}'..."
@@ -48,14 +26,6 @@ else
 	docker buildx use "${BUILDER}"
 fi
 
-# environment variable substitution trick
-envsubst "${diff_env}" <"$(dirname "$0")/../docker/${IMAGE_TAG}/Dockerfile" >"${tmp_dockerfile}"
-
-echo ">>> Substituted dockerfile:"
-echo "----------------------------------------"
-cat "${tmp_dockerfile}"
-echo "----------------------------------------"
-
 # docker push "${DOCKER_USER}"/"${IMAGE_NAME}":"${IMAGE_TAG}"
 
-docker buildx bake --file "$(dirname "$0")"/../docker-compose.yml --push --set "*.dockerfile=${tmp_dockerfile}"
+docker buildx bake --file "$(dirname "$0")"/../docker-compose.yml --push