From 4adcdd43a614c41faa08bab598ca03542d1b0a90 Mon Sep 17 00:00:00 2001
From: Bart Thomee <11445373+bthomee@users.noreply.github.com>
Date: Mon, 28 Jul 2025 14:57:02 -0400
Subject: [PATCH 01/10] Cleanup CI images, add distro release and version

---
 .github/workflows/debian.yml        | 11 ++++++++---
 .github/workflows/rhel.yml          | 11 ++++++++---
 .github/workflows/tools-rippled.yml | 11 ++++++++---
 .github/workflows/ubuntu.yml        | 11 ++++++++---
 docker/debian/Dockerfile            | 24 +++++++++---------------
 docker/rhel/Dockerfile              | 23 ++++++++---------------
 docker/ubuntu/Dockerfile            | 23 ++++++++---------------
 7 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index b07eaf7..a5dfe3f 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -7,6 +7,14 @@ on:
       - docker/debian/Dockerfile
       - test
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
@@ -114,7 +122,6 @@ jobs:
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
-        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -196,13 +203,11 @@ jobs:
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
-        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/rhel.yml b/.github/workflows/rhel.yml
index 9fdca4e..b58f757 100644
--- a/.github/workflows/rhel.yml
+++ b/.github/workflows/rhel.yml
@@ -7,6 +7,14 @@ on:
       - docker/rhel/Dockerfile
       - test
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
 env:
   CONTAINER_REGISTRY: ghcr.io
   REDHAT_REGISTRY: registry.redhat.io
@@ -104,7 +112,6 @@ jobs:
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
-        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -171,13 +178,11 @@ jobs:
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
-        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/tools-rippled.yml b/.github/workflows/tools-rippled.yml
index dd040b2..68e9fd3 100644
--- a/.github/workflows/tools-rippled.yml
+++ b/.github/workflows/tools-rippled.yml
@@ -6,6 +6,14 @@ on:
       - .github/workflows/tools-rippled.yml
       - docker/tools-rippled/Dockerfile
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
@@ -84,7 +92,6 @@ jobs:
           target: ${{ matrix.tool }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
-        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -143,13 +150,11 @@ jobs:
             type=raw,value=latest
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
-        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index f715819..3edf8b9 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -7,6 +7,14 @@ on:
       - docker/ubuntu/Dockerfile
       - test
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
@@ -112,7 +120,6 @@ jobs:
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
-        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -191,13 +198,11 @@ jobs:
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
-        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index c5471f2..5c3775f 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -116,10 +116,10 @@ if [[ "${CXX_VER}" != "${GCC_VERSION}" ]]; then
 fi
 EOF
 
+# Set the Conan home directory, so the users of this image can find the default
+# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
-
-# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -128,14 +128,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Fix the C++ dialect.
-RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
+
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
 
@@ -197,10 +197,10 @@ if [[ "${CXX_VER}" != "${CLANG_VERSION}" ]]; then
 fi
 EOF
 
+# Set the Conan home directory, so the users of this image can find the default
+# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
-
-# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -209,16 +209,10 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Fix the C++ dialect.
-RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
-# Explicitly set the compiler flags. To ensure compatibility with a range of
-# Clang compilers, we must also add extra flags that apply to certain versions
-# of Clang.
-# TODO: Move extra flags into the rippled repository as a custom Conan profile.
+# Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
-CXX_VER=$(${CXX} -dumpversion)
-CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index 5274778..168b0a3 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -82,10 +82,10 @@ if [[ "${CXX_VER}" != "${GCC_VERSION}" ]]; then
 fi
 EOF
 
+# Set the Conan home directory, so the users of this image can find the default
+# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
-
-# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -94,11 +94,10 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Fix the C++ dialect.
-RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
@@ -147,10 +146,10 @@ if [[ ${CXX_VER} -lt ${MINIMUM_CLANG_VERSION} ]]; then
 fi
 EOF
 
+# Set the Conan home directory, so the users of this image can find the default
+# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
-
-# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -159,16 +158,10 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Fix the C++ dialect.
-RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
-# Explicitly set the compiler flags. To ensure compatibility with a range of
-# Clang compilers, we must also add extra flags that apply to certain versions
-# of Clang.
-# TODO: Move extra flags into the rippled repository as a custom Conan profile.
+# Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
-CXX_VER=$(${CXX} -dumpversion)
-CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index fb0eb5b..4f7f21e 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -100,10 +100,10 @@ if [[ "${CXX_VER}" != "${GCC_VERSION}" ]]; then
 fi
 EOF
 
+# Set the Conan home directory, so the users of this image can find the default
+# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
-
-# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -112,11 +112,10 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Fix the C++ dialect.
-RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
-# Explicitly set the compiler flags.
+# Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
@@ -177,10 +176,10 @@ if [[ "${CXX_VER}" != "${CLANG_VERSION}" ]]; then
 fi
 EOF
 
+# Set the Conan home directory, so the users of this image can find the default
+# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
-
-# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -189,16 +188,10 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Fix the C++ dialect.
-RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
-# Explicitly set the compiler flags. To ensure compatibility with a range of
-# Clang compilers, we must also add extra flags that apply to certain versions
-# of Clang.
-# TODO: Move extra flags into the rippled repository as a custom Conan profile.
+# Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
-CXX_VER=$(${CXX} -dumpversion)
-CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF

From 4fe7cdbb11f8382f9b8b0f86b5efc18a686bc7e6 Mon Sep 17 00:00:00 2001
From: Bart Thomee <11445373+bthomee@users.noreply.github.com>
Date: Mon, 28 Jul 2025 14:58:56 -0400
Subject: [PATCH 02/10] Cleanup CI images, add distro release and version

---
 docker/debian/Dockerfile | 4 ++--
 docker/ubuntu/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 5c3775f..68b11e6 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -131,7 +131,7 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
@@ -212,7 +212,7 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 4f7f21e..1e9b7f9 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -115,7 +115,7 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
@@ -191,7 +191,7 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF

From 80c9e3679482e0b1e11b7c1b0f24b974d08b6f80 Mon Sep 17 00:00:00 2001
From: Bart Thomee <11445373+bthomee@users.noreply.github.com>
Date: Mon, 28 Jul 2025 15:02:08 -0400
Subject: [PATCH 03/10] Cleanup CI images, add distro release and version

---
 docker/debian/Dockerfile | 4 ++--
 docker/rhel/Dockerfile   | 4 ++--
 docker/ubuntu/Dockerfile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 68b11e6..03978df 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -131,8 +131,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
 
@@ -212,8 +212,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
 
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index 168b0a3..0d65f15 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -97,8 +97,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 
@@ -161,8 +161,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 1e9b7f9..a4009bb 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -115,8 +115,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF
 
@@ -191,8 +191,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF
 

From 465224dc8fed12a96e19fc4e3030b244b9df15c1 Mon Sep 17 00:00:00 2001
From: Bart Thomee <11445373+bthomee@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:53:49 -0400
Subject: [PATCH 04/10] Add gcc and g++ to Debian and Ubuntu clang images

---
 docker/debian/Dockerfile | 18 +++++++++++++++++-
 docker/debian/README.md  |  2 ++
 docker/rhel/Dockerfile   |  3 ++-
 docker/ubuntu/Dockerfile | 18 +++++++++++++++++-
 docker/ubuntu/README.md  |  2 ++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 1be5fd2..f6d501e 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -95,6 +95,7 @@ update-alternatives --install \
 update-alternatives --auto cc
 update-alternatives --auto gcc
 EOF
+# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
@@ -154,6 +155,21 @@ FROM base AS clang
 # This is not inherited from base image, ensure no manual interaction needed.
 ARG DEBIAN_FRONTEND=noninteractive
 
+# Some build dependencies require GCC to be available.
+COPY --from=gcc-src /usr/local/ /usr/local/
+COPY --from=gcc-src /etc/ld.so.conf.d/*.conf /etc/ld.so.conf.d/
+RUN <<EOF
+ldconfig -v
+dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc
+update-alternatives --install /usr/bin/gcc gcc /usr/local/bin/gcc 100
+update-alternatives --install \
+  /usr/bin/gcc gcc /usr/local/bin/gcc 100 \
+  --slave /usr/bin/g++ g++ /usr/local/bin/g++ \
+  --slave /usr/bin/gcc-ar gcc-ar /usr/local/bin/gcc-ar \
+  --slave /usr/bin/gcc-nm gcc-nm /usr/local/bin/gcc-nm \
+  --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/local/bin/gcc-ranlib
+EOF
+
 # 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.
@@ -178,7 +194,7 @@ update-alternatives --auto cc
 update-alternatives --auto clang
 update-alternatives --auto llvm-cov
 EOF
-
+# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/clang-${CLANG_VERSION}
 ENV CXX=/usr/bin/clang++-${CLANG_VERSION}
 
diff --git a/docker/debian/README.md b/docker/debian/README.md
index 50e7d1f..86baff3 100644
--- a/docker/debian/README.md
+++ b/docker/debian/README.md
@@ -70,6 +70,7 @@ registry.
 DEBIAN_VERSION=bookworm
 CLANG_VERSION=17
 CONAN_VERSION=2.18.0
+GCC_VERSION=12
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
 
@@ -81,6 +82,7 @@ docker buildx build . \
   --build-arg CLANG_VERSION=${CLANG_VERSION} \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
+  --build-arg GCC_VERSION=${GCC_VERSION} \
   --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
 ```
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index 0f98667..5081393 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -64,6 +64,7 @@ update-alternatives \
 update-alternatives --auto cc
 update-alternatives --auto gcc
 EOF
+# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
@@ -126,7 +127,7 @@ rm -rf /var/cache/dnf/*
 update-alternatives --install /usr/bin/cc cc /usr/bin/clang 999
 update-alternatives --auto cc
 EOF
-
+# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/clang
 ENV CXX=/usr/bin/clang++
 
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index af7b7e2..4c90961 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -82,6 +82,7 @@ update-alternatives \
 update-alternatives --auto cc
 update-alternatives --auto gcc
 EOF
+# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
@@ -138,6 +139,21 @@ FROM base AS clang
 # This is not inherited from base image, ensure no manual interaction needed.
 ARG DEBIAN_FRONTEND=noninteractive
 
+# Some build dependencies require GCC to be available.
+ARG GCC_VERSION
+RUN <<EOF
+apt-get update
+apt-get install -y --no-install-recommends \
+    gcc-${GCC_VERSION} \
+    g++-${GCC_VERSION} \
+    debhelper
+apt-get clean
+rm -rf /var/lib/apt/lists/*
+update-alternatives \
+    --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 \
+    --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION}
+EOF
+
 # Install Clang.
 ARG CLANG_VERSION
 RUN <<EOF
@@ -157,7 +173,7 @@ update-alternatives --auto cc
 update-alternatives --auto clang
 update-alternatives --auto llvm-cov
 EOF
-
+# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/clang-${CLANG_VERSION}
 ENV CXX=/usr/bin/clang++-${CLANG_VERSION}
 
diff --git a/docker/ubuntu/README.md b/docker/ubuntu/README.md
index 8804a89..59af322 100644
--- a/docker/ubuntu/README.md
+++ b/docker/ubuntu/README.md
@@ -66,6 +66,7 @@ registry.
 UBUNTU_VERSION=noble
 CLANG_VERSION=18
 CONAN_VERSION=2.18.0
+GCC_VERSION=14
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}
 
@@ -76,6 +77,7 @@ docker buildx build . \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
   --build-arg CLANG_VERSION=${CLANG_VERSION} \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
+  --build-arg GCC_VERSION=${GCC_VERSION} \
   --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
   --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}

From 4701b6b4c182a8c46e36947516a9ed743d1c6c6c Mon Sep 17 00:00:00 2001
From: Bart Thomee <11445373+bthomee@users.noreply.github.com>
Date: Mon, 28 Jul 2025 18:57:21 -0400
Subject: [PATCH 05/10] Add gcc and g++ to Debian and Ubuntu clang images

---
 .github/workflows/debian.yml        | 11 +++--------
 .github/workflows/rhel.yml          | 11 +++--------
 .github/workflows/tools-rippled.yml | 11 +++--------
 .github/workflows/ubuntu.yml        | 11 +++--------
 docker/debian/Dockerfile            | 27 ++++++++++++++++-----------
 docker/rhel/Dockerfile              | 26 ++++++++++++++++----------
 docker/ubuntu/Dockerfile            | 26 ++++++++++++++++----------
 7 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index a5dfe3f..b07eaf7 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -7,14 +7,6 @@ on:
       - docker/debian/Dockerfile
       - test
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
@@ -122,6 +114,7 @@ jobs:
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
+        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -203,11 +196,13 @@ jobs:
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
       - name: Create manifest list and push
         working-directory: /tmp/digests
+        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
+        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/rhel.yml b/.github/workflows/rhel.yml
index b58f757..9fdca4e 100644
--- a/.github/workflows/rhel.yml
+++ b/.github/workflows/rhel.yml
@@ -7,14 +7,6 @@ on:
       - docker/rhel/Dockerfile
       - test
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
 env:
   CONTAINER_REGISTRY: ghcr.io
   REDHAT_REGISTRY: registry.redhat.io
@@ -112,6 +104,7 @@ jobs:
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
+        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -178,11 +171,13 @@ jobs:
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
       - name: Create manifest list and push
         working-directory: /tmp/digests
+        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
+        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/tools-rippled.yml b/.github/workflows/tools-rippled.yml
index 68e9fd3..dd040b2 100644
--- a/.github/workflows/tools-rippled.yml
+++ b/.github/workflows/tools-rippled.yml
@@ -6,14 +6,6 @@ on:
       - .github/workflows/tools-rippled.yml
       - docker/tools-rippled/Dockerfile
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
@@ -92,6 +84,7 @@ jobs:
           target: ${{ matrix.tool }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
+        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -150,11 +143,13 @@ jobs:
             type=raw,value=latest
       - name: Create manifest list and push
         working-directory: /tmp/digests
+        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
+        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 3edf8b9..f715819 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -7,14 +7,6 @@ on:
       - docker/ubuntu/Dockerfile
       - test
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
@@ -120,6 +112,7 @@ jobs:
           target: ${{ matrix.os.compiler_name }}
       - name: Export digest
         if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
+        shell: bash
         run: |
           mkdir -p /tmp/digests
           DIGEST="${{ steps.build.outputs.digest }}"
@@ -198,11 +191,13 @@ jobs:
             type=sha,prefix=${{ matrix.os.compiler_name }}-${{ matrix.os.compiler_version }}-sha-
       - name: Create manifest list and push
         working-directory: /tmp/digests
+        shell: bash
         run: |
           eval "docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(jq -cr '.annotations | map("--annotation \"" + . + "\"") | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.CONTAINER_IMAGE }}@sha256:%s ' *)"
       - name: Inspect image
+        shell: bash
         run: |
           docker buildx imagetools inspect ${{ env.CONTAINER_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index f6d501e..829f31e 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -95,7 +95,6 @@ update-alternatives --install \
 update-alternatives --auto cc
 update-alternatives --auto gcc
 EOF
-# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
@@ -118,10 +117,10 @@ if [[ "${CXX_VER}" != "${GCC_VERSION}" ]]; then
 fi
 EOF
 
-# Set the Conan home directory, so the users of this image can find the default
-# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
+
+# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -130,14 +129,14 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
+# Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
-
 # Print the Conan profile to verify the configuration.
 RUN conan profile show
 
@@ -194,7 +193,7 @@ update-alternatives --auto cc
 update-alternatives --auto clang
 update-alternatives --auto llvm-cov
 EOF
-# Set the compiler environment variables to point to the GCC binaries.
+
 ENV CC=/usr/bin/clang-${CLANG_VERSION}
 ENV CXX=/usr/bin/clang++-${CLANG_VERSION}
 
@@ -214,10 +213,10 @@ if [[ "${CXX_VER}" != "${CLANG_VERSION}" ]]; then
 fi
 EOF
 
-# Set the Conan home directory, so the users of this image can find the default
-# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
+
+# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -226,11 +225,17 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
+# Explicitly set the compiler flags. To ensure compatibility with a range of
+# Clang compilers, we must also add extra flags that apply to certain versions
+# of Clang.
+# TODO: Move extra flags into the rippled repository as a custom Conan profile.
 RUN <<EOF
+CXX_VER=$(${CXX} -dumpversion)
+CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
 
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index 5081393..0290236 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -64,7 +64,6 @@ update-alternatives \
 update-alternatives --auto cc
 update-alternatives --auto gcc
 EOF
-# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
@@ -84,10 +83,10 @@ if [[ "${CXX_VER}" != "${GCC_VERSION}" ]]; then
 fi
 EOF
 
-# Set the Conan home directory, so the users of this image can find the default
-# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
+
+# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -96,11 +95,12 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
+# Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 
@@ -127,7 +127,7 @@ rm -rf /var/cache/dnf/*
 update-alternatives --install /usr/bin/cc cc /usr/bin/clang 999
 update-alternatives --auto cc
 EOF
-# Set the compiler environment variables to point to the GCC binaries.
+
 ENV CC=/usr/bin/clang
 ENV CXX=/usr/bin/clang++
 
@@ -148,10 +148,10 @@ if [[ ${CXX_VER} -lt ${MINIMUM_CLANG_VERSION} ]]; then
 fi
 EOF
 
-# Set the Conan home directory, so the users of this image can find the default
-# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
+
+# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -160,11 +160,17 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
+# Explicitly set the compiler flags. To ensure compatibility with a range of
+# Clang compilers, we must also add extra flags that apply to certain versions
+# of Clang.
+# TODO: Move extra flags into the rippled repository as a custom Conan profile.
 RUN <<EOF
+CXX_VER=$(${CXX} -dumpversion)
+CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 4c90961..62b1b6b 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -82,7 +82,6 @@ update-alternatives \
 update-alternatives --auto cc
 update-alternatives --auto gcc
 EOF
-# Set the compiler environment variables to point to the GCC binaries.
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
@@ -102,10 +101,10 @@ if [[ "${CXX_VER}" != "${GCC_VERSION}" ]]; then
 fi
 EOF
 
-# Set the Conan home directory, so the users of this image can find the default
-# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
+
+# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -114,11 +113,12 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
+# Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF
 
@@ -173,7 +173,7 @@ update-alternatives --auto cc
 update-alternatives --auto clang
 update-alternatives --auto llvm-cov
 EOF
-# Set the compiler environment variables to point to the GCC binaries.
+
 ENV CC=/usr/bin/clang-${CLANG_VERSION}
 ENV CXX=/usr/bin/clang++-${CLANG_VERSION}
 
@@ -193,10 +193,10 @@ if [[ "${CXX_VER}" != "${CLANG_VERSION}" ]]; then
 fi
 EOF
 
-# Set the Conan home directory, so the users of this image can find the default
-# profile.
 ENV HOME=/root
 WORKDIR ${HOME}
+
+# Set Conan home directory, so the users of this image can find default profile
 ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
@@ -205,11 +205,17 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)/profiles/default
+# Explicitly set the compiler flags. To ensure compatibility with a range of
+# Clang compilers, we must also add extra flags that apply to certain versions
+# of Clang.
+# TODO: Move extra flags into the rippled repository as a custom Conan profile.
 RUN <<EOF
+CXX_VER=$(${CXX} -dumpversion)
+CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF
 

From af45504efaab18328841f5e9261fd999dab3811c Mon Sep 17 00:00:00 2001
From: Bronek Kozicki <brok@incorrekt.com>
Date: Tue, 29 Jul 2025 10:30:59 +0100
Subject: [PATCH 06/10] Pick the default gcc/g++ from distro

---
 docker/debian/Dockerfile | 21 +++++++--------------
 docker/rhel/Dockerfile   |  9 +++++----
 docker/ubuntu/Dockerfile | 15 ++++-----------
 test/run.sh              |  3 ++-
 test/src/main.cpp        |  9 +++++++++
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 829f31e..65a16b6 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -143,7 +143,7 @@ RUN conan profile show
 # Test the image by compiling a simple C++ program.
 RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
 cp -r /test test
-cd test && ./run.sh
+cd test && ./run.sh gcc
 cd ..
 rm -rf test
 EOF
@@ -154,19 +154,12 @@ FROM base AS clang
 # This is not inherited from base image, ensure no manual interaction needed.
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Some build dependencies require GCC to be available.
-COPY --from=gcc-src /usr/local/ /usr/local/
-COPY --from=gcc-src /etc/ld.so.conf.d/*.conf /etc/ld.so.conf.d/
+# Some build dependencies require GCC to be also available.
 RUN <<EOF
-ldconfig -v
-dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc
-update-alternatives --install /usr/bin/gcc gcc /usr/local/bin/gcc 100
-update-alternatives --install \
-  /usr/bin/gcc gcc /usr/local/bin/gcc 100 \
-  --slave /usr/bin/g++ g++ /usr/local/bin/g++ \
-  --slave /usr/bin/gcc-ar gcc-ar /usr/local/bin/gcc-ar \
-  --slave /usr/bin/gcc-nm gcc-nm /usr/local/bin/gcc-nm \
-  --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/local/bin/gcc-ranlib
+apt-get update
+apt-get install -y --no-install-recommends gcc g++
+apt-get clean
+rm -rf /var/lib/apt/lists/*
 EOF
 
 # Install Clang. Use the LLVM apt repository to access the latest versions. We
@@ -245,7 +238,7 @@ RUN conan profile show
 # Test the image by compiling a simple C++ program.
 RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
 cp -r /test test
-cd test && ./run.sh
+cd test && ./run.sh clang
 cd ..
 rm -rf test
 EOF
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index 0290236..c626821 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -110,7 +110,7 @@ RUN conan profile show
 # Test the image by compiling a simple C++ program.
 RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
 cp -r /test test
-cd test && ./run.sh
+cd test && ./run.sh gcc
 cd ..
 rm -rf test
 EOF
@@ -119,9 +119,10 @@ EOF
 FROM base AS clang
 
 # Install Clang. Note that in the RHEL UBIs, we cannot choose the Clang version
-# to install and we get what is available.
+# to install and we get what is available. Some build dependencies require GCC
+# to be also available.
 RUN <<EOF
-dnf install -y --setopt=tsflags=nodocs clang llvm
+dnf install -y --setopt=tsflags=nodocs clang llvm gcc gcc-c++
 dnf clean -y all
 rm -rf /var/cache/dnf/*
 update-alternatives --install /usr/bin/cc cc /usr/bin/clang 999
@@ -180,7 +181,7 @@ RUN conan profile show
 # Test the image by compiling a simple C++ program.
 RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
 cp -r /test test
-cd test && ./run.sh
+cd test && ./run.sh clang
 cd ..
 rm -rf test
 EOF
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 62b1b6b..45f5a55 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -128,7 +128,7 @@ RUN conan profile show
 # Test the image by compiling a simple C++ program.
 RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
 cp -r /test test
-cd test && ./run.sh
+cd test && ./run.sh gcc
 cd ..
 rm -rf test
 EOF
@@ -139,19 +139,12 @@ FROM base AS clang
 # This is not inherited from base image, ensure no manual interaction needed.
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Some build dependencies require GCC to be available.
-ARG GCC_VERSION
+# Some build dependencies require GCC to be also available.
 RUN <<EOF
 apt-get update
-apt-get install -y --no-install-recommends \
-    gcc-${GCC_VERSION} \
-    g++-${GCC_VERSION} \
-    debhelper
+apt-get install -y --no-install-recommends gcc g++
 apt-get clean
 rm -rf /var/lib/apt/lists/*
-update-alternatives \
-    --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 \
-    --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION}
 EOF
 
 # Install Clang.
@@ -225,7 +218,7 @@ RUN conan profile show
 # Test the image by compiling a simple C++ program.
 RUN --mount=type=bind,source=test,target=/test,readonly <<EOF
 cp -r /test test
-cd test && ./run.sh
+cd test && ./run.sh clang
 cd ..
 rm -rf test
 EOF
diff --git a/test/run.sh b/test/run.sh
index 828d7e3..a2377d4 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -ex
+set -o pipefail
 
 # Install Conan dependencies, configure the project, and build the executable.
 conan install . --output-folder=build --build=missing
@@ -9,7 +10,7 @@ cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
 cmake --build .
 
 # Run the executable.
-./example
+./example | grep -E "^Compiler used: $1$"
 
 # Remove the Conan dependencies.
 conan remove -c "*"
diff --git a/test/src/main.cpp b/test/src/main.cpp
index 0c8fabf..6594ce2 100644
--- a/test/src/main.cpp
+++ b/test/src/main.cpp
@@ -30,5 +30,14 @@ int main(void) {
 
     std::printf("ZLIB VERSION: %s\n", zlibVersion());
 
+#ifdef __clang__
+    constexpr char which[] = "clang";
+#elif __GNUC__
+    constexpr char which[] = "gcc";
+#else
+    constexpr char which[] = "unknown";
+#endif
+    std::printf("Compiler used: %s\n", which);
+
     return EXIT_SUCCESS;
 }

From 37a7565a805cc0ddb6ae2d418f9a53152fa350d4 Mon Sep 17 00:00:00 2001
From: Bronek Kozicki <brok@incorrekt.com>
Date: Tue, 29 Jul 2025 10:49:15 +0100
Subject: [PATCH 07/10] Add /usr/bin/c++ symlink for the selected compiler

---
 docker/debian/Dockerfile | 26 ++++++++++++++++---------
 docker/rhel/Dockerfile   | 24 +++++++++++++++--------
 docker/ubuntu/Dockerfile | 42 ++++++++++++++++++++++++----------------
 3 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 65a16b6..56f651e 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -81,9 +81,12 @@ ldconfig -v
 dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc
 dpkg-divert --divert /usr/bin/g++.orig --rename /usr/bin/g++
 dpkg-divert --divert /usr/bin/gfortran.orig --rename /usr/bin/gfortran
-update-alternatives --install /usr/bin/cc cc /usr/local/bin/gcc 999
-update-alternatives --install \
-  /usr/bin/gcc gcc /usr/local/bin/gcc 100 \
+update-alternatives \
+  --install /usr/bin/cc cc /usr/local/bin/gcc 999
+update-alternatives \
+  --install /usr/bin/c++ c++ /usr/local/bin/g++ 999
+update-alternatives \
+  --install /usr/bin/gcc gcc /usr/local/bin/gcc 100 \
   --slave /usr/bin/g++ g++ /usr/local/bin/g++ \
   --slave /usr/bin/gcc-ar gcc-ar /usr/local/bin/gcc-ar \
   --slave /usr/bin/gcc-nm gcc-nm /usr/local/bin/gcc-nm \
@@ -93,6 +96,7 @@ update-alternatives --install \
   --slave /usr/bin/gcov-dump gcov-dump /usr/local/bin/gcov-dump \
   --slave /usr/bin/lto-dump lto-dump /usr/local/bin/lto-dump
 update-alternatives --auto cc
+update-alternatives --auto c++
 update-alternatives --auto gcc
 EOF
 ENV CC=/usr/bin/gcc
@@ -176,13 +180,17 @@ apt-get update
 apt-get install -t llvm-toolchain-${DEBIAN_VERSION}-${CLANG_VERSION} -y --no-install-recommends clang-${CLANG_VERSION} llvm-${CLANG_VERSION}
 apt-get clean
 rm -rf /var/lib/apt/lists/*
-update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 999
-update-alternatives --install \
-    /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 100 \
-    --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION}
-update-alternatives --install \
-    /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${CLANG_VERSION} 100
+update-alternatives \
+  --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 999
+update-alternatives \
+  --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 999
+update-alternatives \
+  --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 100 \
+  --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION}
+update-alternatives \
+  --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${CLANG_VERSION} 100
 update-alternatives --auto cc
+update-alternatives --auto c++
 update-alternatives --auto clang
 update-alternatives --auto llvm-cov
 EOF
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index c626821..2c279cc 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -53,15 +53,19 @@ dnf remove -y gcc gcc-c++
 dnf install -y --setopt=tsflags=nodocs gcc-toolset-${GCC_VERSION}-gcc gcc-toolset-${GCC_VERSION}-gcc-c++
 dnf clean -y all
 rm -rf /var/cache/dnf/*
-update-alternatives --install /usr/bin/cc cc /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcc 999
 update-alternatives \
-    --install /usr/bin/gcc gcc /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcc 100 \
-    --slave /usr/bin/g++ g++ /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/g++ \
-    --slave /usr/bin/cpp cpp /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/cpp \
-    --slave /usr/bin/gcov gcov /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcov \
-    --slave /usr/bin/gcov-dump gcov-dump /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcov-dump-${GCC_VERSION} \
-    --slave /usr/bin/gcov-tool gcov-tool /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcov-tool-${GCC_VERSION}
+  --install /usr/bin/cc cc /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcc 999
+update-alternatives \
+  --install /usr/bin/c++ c++ /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/g++ 999
+update-alternatives \
+  --install /usr/bin/gcc gcc /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcc 100 \
+  --slave /usr/bin/g++ g++ /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/g++ \
+  --slave /usr/bin/cpp cpp /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/cpp \
+  --slave /usr/bin/gcov gcov /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcov \
+  --slave /usr/bin/gcov-dump gcov-dump /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcov-dump-${GCC_VERSION} \
+  --slave /usr/bin/gcov-tool gcov-tool /opt/rh/gcc-toolset-${GCC_VERSION}/root/usr/bin/gcov-tool-${GCC_VERSION}
 update-alternatives --auto cc
+update-alternatives --auto c++
 update-alternatives --auto gcc
 EOF
 ENV CC=/usr/bin/gcc
@@ -125,8 +129,12 @@ RUN <<EOF
 dnf install -y --setopt=tsflags=nodocs clang llvm gcc gcc-c++
 dnf clean -y all
 rm -rf /var/cache/dnf/*
-update-alternatives --install /usr/bin/cc cc /usr/bin/clang 999
+update-alternatives \
+  --install /usr/bin/cc cc /usr/bin/clang 999
+update-alternatives \
+  --install /usr/bin/c++ c++ /usr/bin/clang++ 999
 update-alternatives --auto cc
+update-alternatives --auto c++
 EOF
 
 ENV CC=/usr/bin/clang
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 45f5a55..1f9da55 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -67,19 +67,23 @@ ARG GCC_VERSION
 RUN <<EOF
 apt-get update
 apt-get install -y --no-install-recommends \
-    gcc-${GCC_VERSION} \
-    g++-${GCC_VERSION} \
-    debhelper
+  gcc-${GCC_VERSION} \
+  g++-${GCC_VERSION} \
+  debhelper
 apt-get clean
 rm -rf /var/lib/apt/lists/*
-update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-${GCC_VERSION} 999
 update-alternatives \
-    --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 \
-    --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} \
-    --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_VERSION} \
-    --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-${GCC_VERSION} \
-    --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-${GCC_VERSION}
+  --install /usr/bin/cc cc /usr/bin/gcc-${GCC_VERSION} 999
+update-alternatives \
+  --install /usr/bin/c++ c++ /usr/bin/g++-${GCC_VERSION} 999
+update-alternatives \
+  --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 \
+  --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} \
+  --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_VERSION} \
+  --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-${GCC_VERSION} \
+  --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-${GCC_VERSION}
 update-alternatives --auto cc
+update-alternatives --auto c++
 update-alternatives --auto gcc
 EOF
 ENV CC=/usr/bin/gcc
@@ -152,17 +156,21 @@ ARG CLANG_VERSION
 RUN <<EOF
 apt-get update
 apt-get install -y --no-install-recommends \
-    clang-${CLANG_VERSION} \
-    llvm-${CLANG_VERSION}
+  clang-${CLANG_VERSION} \
+  llvm-${CLANG_VERSION}
 apt-get clean
 rm -rf /var/lib/apt/lists/*
-update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 999
-update-alternatives --install \
-    /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 100 \
-    --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION}
-update-alternatives --install \
-    /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${CLANG_VERSION} 100
+update-alternatives \
+  --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 999
+update-alternatives \
+  --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 999
+update-alternatives \
+  --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 100 \
+  --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION}
+update-alternatives \
+  --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${CLANG_VERSION} 100
 update-alternatives --auto cc
+update-alternatives --auto c++
 update-alternatives --auto clang
 update-alternatives --auto llvm-cov
 EOF

From 6e3312c77ce5337f4fcbcd698cb884b10878ea5c Mon Sep 17 00:00:00 2001
From: Bronek Kozicki <brok@incorrekt.com>
Date: Tue, 29 Jul 2025 11:00:33 +0100
Subject: [PATCH 08/10] Remove GCC_VERSION from README.md files

---
 docker/debian/README.md | 2 --
 docker/ubuntu/README.md | 2 --
 2 files changed, 4 deletions(-)

diff --git a/docker/debian/README.md b/docker/debian/README.md
index 86baff3..50e7d1f 100644
--- a/docker/debian/README.md
+++ b/docker/debian/README.md
@@ -70,7 +70,6 @@ registry.
 DEBIAN_VERSION=bookworm
 CLANG_VERSION=17
 CONAN_VERSION=2.18.0
-GCC_VERSION=12
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
 
@@ -82,7 +81,6 @@ docker buildx build . \
   --build-arg CLANG_VERSION=${CLANG_VERSION} \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
-  --build-arg GCC_VERSION=${GCC_VERSION} \
   --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
 ```
diff --git a/docker/ubuntu/README.md b/docker/ubuntu/README.md
index 59af322..8804a89 100644
--- a/docker/ubuntu/README.md
+++ b/docker/ubuntu/README.md
@@ -66,7 +66,6 @@ registry.
 UBUNTU_VERSION=noble
 CLANG_VERSION=18
 CONAN_VERSION=2.18.0
-GCC_VERSION=14
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}
 
@@ -77,7 +76,6 @@ docker buildx build . \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
   --build-arg CLANG_VERSION=${CLANG_VERSION} \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
-  --build-arg GCC_VERSION=${GCC_VERSION} \
   --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
   --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}

From 9d534eb8cb1be151364a8851e18a693ae4a7808f Mon Sep 17 00:00:00 2001
From: Bronek Kozicki <brok@incorrekt.com>
Date: Tue, 29 Jul 2025 11:07:01 +0100
Subject: [PATCH 09/10] Consolidate RUN for gcc install with other RUN

---
 docker/debian/Dockerfile | 12 +++---------
 docker/ubuntu/Dockerfile | 14 ++++----------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 56f651e..dc75851 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -158,20 +158,14 @@ FROM base AS clang
 # This is not inherited from base image, ensure no manual interaction needed.
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Some build dependencies require GCC to be also available.
-RUN <<EOF
-apt-get update
-apt-get install -y --no-install-recommends gcc g++
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-EOF
-
 # 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.
+# base or source images. Some build dependencies require GCC to be also available.
 ARG DEBIAN_VERSION
 ARG CLANG_VERSION
 RUN <<EOF
+apt-get update
+apt-get install -y --no-install-recommends gcc g++
 curl --no-progress-meter https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/keyrings/llvm.gpg
 printf "%s\n%s\n" \
   "deb [signed-by=/etc/apt/keyrings/llvm.gpg] https://apt.llvm.org/${DEBIAN_VERSION}/ llvm-toolchain-${DEBIAN_VERSION}-${CLANG_VERSION} main" \
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 1f9da55..0c7181e 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -143,21 +143,15 @@ FROM base AS clang
 # This is not inherited from base image, ensure no manual interaction needed.
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Some build dependencies require GCC to be also available.
-RUN <<EOF
-apt-get update
-apt-get install -y --no-install-recommends gcc g++
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-EOF
-
-# Install Clang.
+# Install Clang. Some build dependencies require GCC to be also available.
 ARG CLANG_VERSION
 RUN <<EOF
 apt-get update
 apt-get install -y --no-install-recommends \
   clang-${CLANG_VERSION} \
-  llvm-${CLANG_VERSION}
+  llvm-${CLANG_VERSION} \
+  gcc \
+  g++
 apt-get clean
 rm -rf /var/lib/apt/lists/*
 update-alternatives \

From 7909f75bfa73ed89e10573b1392c6f90294ddb59 Mon Sep 17 00:00:00 2001
From: Bronek Kozicki <brok@incorrekt.com>
Date: Tue, 29 Jul 2025 11:16:03 +0100
Subject: [PATCH 10/10] Add package_id

---
 docker/debian/Dockerfile | 2 ++
 docker/rhel/Dockerfile   | 2 ++
 docker/ubuntu/Dockerfile | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index dc75851..907a114 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -139,6 +139,7 @@ RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
 # Print the Conan profile to verify the configuration.
@@ -231,6 +232,7 @@ CXX_VER=$(${CXX} -dumpversion)
 CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
 
diff --git a/docker/rhel/Dockerfile b/docker/rhel/Dockerfile
index 2c279cc..492d4d3 100644
--- a/docker/rhel/Dockerfile
+++ b/docker/rhel/Dockerfile
@@ -105,6 +105,7 @@ RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 
@@ -180,6 +181,7 @@ CXX_VER=$(${CXX} -dumpversion)
 CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 0c7181e..11fffe4 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -123,6 +123,7 @@ RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' $(conan config home)
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF
 
@@ -211,6 +212,7 @@ CXX_VER=$(${CXX} -dumpversion)
 CXX_VER=${CXX_VER%%.*}
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF