Repeat DEBIAN_VERSION arg as it is not inherited

Author: bthomee

docker/debian/Dockerfile

@@ -15,6 +15,9 @@ FROM ${BASE_IMAGE} AS gcc-src
 # ====================== BASE IMAGE ======================
 FROM debian:${DEBIAN_VERSION} AS base
 
+# This is not inherited from the base image.
+ARG DEBIAN_VERSION
+
 # Use Bash as the default shell for RUN commands, using the options
 # `set -o errexit -o pipefail`, and as the entrypoint.
 SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]

docker/debian/README.md

@@ -51,11 +51,12 @@ docker buildx build . \
   --target gcc \
   --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
-  --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
   --build-arg GCC_VERSION=${GCC_VERSION} \
-  --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
+  --build-arg CCACHE_VERSION=${CCACHE_VERSION} \
   --build-arg CMAKE_VERSION=${CMAKE_VERSION} \
+  --build-arg CONAN_VERSION=${CONAN_VERSION} \
+  --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
   --build-arg MOLD_VERSION=${MOLD_VERSION} \
   --build-arg RUST_VERSION=${RUST_VERSION} \
   --tag ${CONTAINER_IMAGE}

docker/rhel/Dockerfile

@@ -23,7 +23,7 @@ EOF
 RUN <<EOF
 pkgs=()
 pkgs+=(ca-certificates)   # Enable TLS verification for HTTPS connections by providing trusted root certificates.
-if [ "${RHEL_VERSION}" -eq "8" ]; then
+if [[ "${RHEL_VERSION}" == "8" ]]; then
   pkgs+=(binutils)        # Required build tool.
 else
   pkgs+=(binutils-gold)   # Required build tool.
@@ -96,7 +96,7 @@ RUN pip install --no-cache \
 ARG CCACHE_VERSION
 
 RUN <<EOF
-if [ "${RHEL_VERSION}" -eq "8" ]; then
+if [[ "${RHEL_VERSION}" == "8" ]]; then
   dnf update -y
   dnf install -y --allowerasing --setopt=tsflags=nodocs ccache
   dnf clean -y all