Use custom user configuration values to influence package ID

Author: bthomee

docker/debian/Dockerfile

@@ -71,6 +71,7 @@ FROM base AS gcc
 
 # These are not inherited from the base image.
 ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBIAN_VERSION
 ARG GCC_VERSION
 
 # Copy GCC from the source image, make the package manager aware of its
@@ -132,10 +133,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags, as well as a custom flag that specifies the
+# distribution name and version. This is important to avoid conflicts between
+# builds using the same compiler but different distribution versions.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+user.package:distro="debian-${DEBIAN_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 
@@ -154,8 +159,8 @@ EOF
 FROM base AS clang
 
 # These are not inherited from the base image.
-ARG DEBIAN_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBIAN_VERSION
 
 # Install Clang. Use the LLVM apt repository to access the latest versions. Some
 # build dependencies require GCC to be also available.
@@ -217,10 +222,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Explicitly set the compiler flags, as well as a custom flag that specifies the
+# distribution name and version. This is important to avoid conflicts between
+# builds using the same compiler but different distribution versions.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+user.package:distro="debian-${DEBIAN_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 

docker/rhel/Dockerfile

@@ -42,12 +42,15 @@ RUN pip install --no-cache conan==${CONAN_VERSION} gcovr==${GCOVR_VERSION}
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
+# These are not inherited from the base image.
+ARG GCC_VERSION
+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
 # default GCC packages first, and then reference the GCC toolset binaries
 # directly.
-ARG GCC_VERSION
 RUN <<EOF
 dnf remove -y gcc gcc-c++
 dnf install -y --setopt=tsflags=nodocs gcc-toolset-${GCC_VERSION}-gcc gcc-toolset-${GCC_VERSION}-gcc-c++
@@ -100,10 +103,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags, as well as a custom flag that specifies the
+# distribution name and version. This is important to avoid conflicts between
+# builds using the same compiler but different distribution versions.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+user.package:distro="rhel-${RHEL_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 
@@ -121,6 +128,9 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
+# This is not inherited from the 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.
@@ -168,10 +178,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags, as well as a custom flag that specifies the
+# distribution name and version. This is important to avoid conflicts between
+# builds using the same compiler but different distribution versions.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+user.package:distro="rhel-${RHEL_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 

docker/ubuntu/Dockerfile

@@ -58,12 +58,13 @@ RUN pipx install --pip-args='--no-cache' conan==${CONAN_VERSION} && \
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
-# This is not inherited from the base image.
+# These are not inherited from the base image.
 ARG DEBIAN_FRONTEND=noninteractive
+ARG GCC_VERSION
+ARG UBUNTU_VERSION
 
 # Install GCC and create the necessary symlinks. We only support packaging with
 # gcc because of the hard package dependencies from libtool to gcc
-ARG GCC_VERSION
 RUN <<EOF
 apt-get update
 apt-get install -y --no-install-recommends \
@@ -118,10 +119,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags, as well as a custom flag that specifies the
+# distribution name and version. This is important to avoid conflicts between
+# builds using the same compiler but different distribution versions.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+user.package:distro="ubuntu-${UBUNTU_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 
@@ -139,8 +144,9 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
-# This is not inherited from the base image.
+# These are not inherited from the base image.
 ARG DEBIAN_FRONTEND=noninteractive
+ARG UBUNTU_VERSION
 
 # Install Clang. Some build dependencies require GCC to be also available.
 ARG CLANG_VERSION
@@ -199,10 +205,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags, as well as a custom flag that specifies the
+# distribution name and version. This is important to avoid conflicts between
+# builds using the same compiler but different distribution versions.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+user.package:distro="ubuntu-${UBUNTU_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF