Fix OS version in certain images (#22)

Author: Bronek

docker/debian/Dockerfile

@@ -69,7 +69,8 @@ RUN pipx install --pip-args='--no-cache' conan==${CONAN_VERSION} && \
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
-# This is not inherited from base image, ensure no manual interaction needed.
+# These are not inherited from base image.
+ARG DEBIAN_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Copy GCC from the source image, make the package manager aware of its
@@ -156,13 +157,13 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
-# This is not inherited from base image, ensure no manual interaction needed.
+# These are not inherited from base image.
+ARG DEBIAN_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install Clang. Use the LLVM apt repository to access the latest versions. We
 # must repeat the DEBIAN_VERSION argument here, as it is not inherited from the
 # base or source images. Some build dependencies require GCC to be also available.
-ARG DEBIAN_VERSION
 ARG CLANG_VERSION
 RUN <<EOF
 apt-get update

docker/rhel/Dockerfile

@@ -42,6 +42,9 @@ RUN pip install --no-cache conan==${CONAN_VERSION} gcovr==${GCOVR_VERSION}
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
+# This is not inherited from base image.
+ARG RHEL_VERSION
+
 # Install GCC. Red Hat installs GCC as a Software Collection (SCL) package,
 # where typically you would run `scl enable gcc-toolset-X` to open another Bash
 # shell with the GCC toolset enabled. To avoid having to do so, we delete the
@@ -122,6 +125,9 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
+# This is not inherited from base image.
+ARG RHEL_VERSION
+
 # Install Clang. Note that in the RHEL UBIs, we cannot choose the Clang version
 # to install and we get what is available. Some build dependencies require GCC
 # to be also available.

docker/tools-rippled/Dockerfile

@@ -48,6 +48,10 @@ ENV PIPX_HOME=/opt/pipx \
 
 FROM base AS clang-format
 
+# These are not inherited from base image.
+ARG UBUNTU_VERSION
+ARG DEBIAN_FRONTEND=noninteractive
+
 # Install clang-format.
 ARG CLANG_FORMAT_VERSION
 ARG PRE_COMMIT_VERSION

docker/ubuntu/Dockerfile

@@ -58,7 +58,8 @@ RUN pipx install --pip-args='--no-cache' conan==${CONAN_VERSION} && \
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
-# This is not inherited from base image, ensure no manual interaction needed.
+# These are not inherited from base image.
+ARG UBUNTU_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install GCC and create the necessary symlinks. We only support packaging with
@@ -140,7 +141,8 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
-# This is not inherited from base image, ensure no manual interaction needed.
+# These are not inherited from base image.
+ARG UBUNTU_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install Clang. Some build dependencies require GCC to be also available.