Sets distro-specific OS name (#24)

Packages generally are configured to have the architecture, OS, and compiler+version determine the package ID. This change adds a new OS option per CI image to support the distro being used, e.g. "debian-bookworm".

Author: bthomee

.github/workflows/debian.yml

@@ -18,7 +18,7 @@ defaults:
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
-  CONAN_VERSION: 2.18.0
+  CONAN_VERSION: 2.19.1
   GCOVR_VERSION: 8.3
   FALLBACK_GCC: 12
   FALLBACK_CLANG: 16

.github/workflows/rhel.yml

@@ -19,7 +19,7 @@ env:
   CONTAINER_REGISTRY: ghcr.io
   REDHAT_REGISTRY: registry.redhat.io
   BUILDKIT_PROGRESS: plain
-  CONAN_VERSION: 2.18.0
+  CONAN_VERSION: 2.19.1
   GCOVR_VERSION: 8.3
 
 jobs:

.github/workflows/ubuntu.yml

@@ -18,7 +18,7 @@ defaults:
 env:
   CONTAINER_REGISTRY: ghcr.io
   BUILDKIT_PROGRESS: plain
-  CONAN_VERSION: 2.18.0
+  CONAN_VERSION: 2.19.1
   GCOVR_VERSION: 8.3
   FALLBACK_GCC: 12
   FALLBACK_CLANG: 16

docker/debian/Dockerfile

@@ -44,13 +44,13 @@ pkgs+=(file)            # Required packaging tool.
 pkgs+=(git)             # Required build tool.
 pkgs+=(gpg)             # Dependency for tools requiring signing or encrypting/decrypting.
 pkgs+=(gpg-agent)       # Dependency for tools requiring signing or encrypting/decrypting.
-pkgs+=(jq)              # Pretty printing.
+pkgs+=(jq)              # JSON manipulation.
 pkgs+=(libc6-dev)       # Required build tool.
 pkgs+=(ninja-build)     # Required build tool.
 pkgs+=(pipx)            # Package manager for Python applications.
 pkgs+=(python3-jinja2)  # Required build tool.
-pkgs+=(wget)            # Required build tool.
 pkgs+=(vim)             # Text editor.
+pkgs+=(wget)            # Required build tool.
 apt-get update
 apt-get install -y --no-install-recommends "${pkgs[@]}"
 apt-get clean
@@ -72,6 +72,7 @@ FROM base AS gcc
 # These are not inherited from base image.
 ARG DEBIAN_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
+ARG GCC_VERSION
 
 # Copy GCC from the source image, make the package manager aware of its
 # existence, and create the necessary symlinks.
@@ -104,10 +105,7 @@ EOF
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
-# Check that the installed GCC version matches the expected version. We must
-# repeat the GCC_VERSION argument here, as it is not inherited from the source
-# image.
-ARG GCC_VERSION
+# Check that the installed GCC version matches the expected version.
 RUN <<EOF
 CC_VER=$(${CC} -dumpversion)
 CC_VER=${CC_VER%%.*}
@@ -135,14 +133,20 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Add the distribution name and version, so they can be taken into account when
+# building dependencies. This requires setting the `os` field in the activated
+# profile where this image is used to the appropriate value.
+RUN <<EOF
+cat >> $(conan config home)/settings_user.yml <<EOT
+os:
+  debian-${DEBIAN_VERSION}:
+EOT
+EOF
+
+# 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}"]
-core.package_id:default_build_mode=full_mode
-core.package_id:default_embed_mode=full_mode
-core.package_id:default_non_embed_mode=full_mode
 EOT
 EOF
 
@@ -164,9 +168,8 @@ FROM base AS clang
 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.
+# Install Clang. Use the LLVM apt repository to access the latest versions. Some
+# build dependencies require GCC to be also available.
 ARG CLANG_VERSION
 RUN <<EOF
 apt-get update
@@ -225,14 +228,20 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
+# Add the distribution name and version, so they can be taken into account when
+# building dependencies. This requires setting the `os` field in the activated
+# profile where this image is used to the appropriate value.
+RUN <<EOF
+cat >> $(conan config home)/settings_user.yml <<EOT
+os:
+  debian-${DEBIAN_VERSION}:
+EOT
+EOF
+
 # Explicitly set the compiler flags and the distribution name and version.
 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}"]
-core.package_id:default_build_mode=full_mode
-core.package_id:default_embed_mode=full_mode
-core.package_id:default_non_embed_mode=full_mode
 EOT
 EOF
 

docker/debian/README.md

@@ -45,7 +45,7 @@ registry.
 ```shell
 DEBIAN_VERSION=bookworm
 GCC_VERSION=12
-CONAN_VERSION=2.18.0
+CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc-${GCC_VERSION}
 
@@ -69,7 +69,7 @@ registry.
 ```shell
 DEBIAN_VERSION=bookworm
 CLANG_VERSION=17
-CONAN_VERSION=2.18.0
+CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
 

docker/rhel/Dockerfile

@@ -19,16 +19,16 @@ pkgs+=(file)             # Required packaging tool.
 pkgs+=(git)              # Required build tool.
 pkgs+=(gpg)              # Dependency for tools requiring signing or encrypting/decrypting.
 pkgs+=(gnupg2)           # Dependency for tools requiring signing or encrypting/decrypting.
-pkgs+=(jq)               # Pretty printing.
+pkgs+=(jq)               # JSON manipulation.
 pkgs+=(libstdc++-static) # Required to statically link libraries into rippled.
 pkgs+=(ninja-build)      # Required build tool.
 pkgs+=(perl-FindBin)     # Required to compile OpenSSL.
 pkgs+=(python3-jinja2)   # Required build tool.
 pkgs+=(python3-pip)      # Package manager for Python applications.
 pkgs+=(rpm-build)        # Required packaging tool.
 pkgs+=(rpmdevtools)      # Required packaging tool.
-pkgs+=(wget)             # Required build tool.
 pkgs+=(vim)              # Text editor.
+pkgs+=(wget)             # Required build tool.
 dnf install -y --allowerasing --setopt=tsflags=nodocs "${pkgs[@]}"
 dnf clean -y all
 rm -rf /var/cache/dnf/*
@@ -103,14 +103,20 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Add the distribution name and version, so they can be taken into account when
+# building dependencies. This requires setting the `os` field in the activated
+# profile where this image is used to the appropriate value.
+RUN <<EOF
+cat >> $(conan config home)/settings_user.yml <<EOT
+os:
+  rhel-${RHEL_VERSION}:
+EOT
+EOF
+
+# 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}"]
-core.package_id:default_build_mode=full_mode
-core.package_id:default_embed_mode=full_mode
-core.package_id:default_non_embed_mode=full_mode
 EOT
 EOF
 
@@ -178,14 +184,20 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Add the distribution name and version, so they can be taken into account when
+# building dependencies. This requires setting the `os` field in the activated
+# profile where this image is used to the appropriate value.
+RUN <<EOF
+cat >> $(conan config home)/settings_user.yml <<EOT
+os:
+  rhel-${RHEL_VERSION}:
+EOT
+EOF
+
+# 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}"]
-core.package_id:default_build_mode=full_mode
-core.package_id:default_embed_mode=full_mode
-core.package_id:default_non_embed_mode=full_mode
 EOT
 EOF
 

docker/rhel/README.md

@@ -60,7 +60,7 @@ registry.
 ```shell
 RHEL_VERSION=9.6
 GCC_VERSION=13
-CONAN_VERSION=2.18.0
+CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:gcc-${GCC_VERSION}
 
@@ -83,7 +83,7 @@ registry.
 
 ```shell
 RHEL_VERSION=9.6
-CONAN_VERSION=2.18.0
+CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:clang-${CLANG_VERSION}
 

docker/ubuntu/Dockerfile

@@ -33,13 +33,13 @@ pkgs+=(file)            # Required packaging tool.
 pkgs+=(git)             # Required build tool.
 pkgs+=(gpg)             # Dependency for tools requiring signing or encrypting/decrypting.
 pkgs+=(gpg-agent)       # Dependency for tools requiring signing or encrypting/decrypting.
-pkgs+=(jq)              # Pretty printing.
+pkgs+=(jq)              # JSON manipulation.
 pkgs+=(libc6-dev)       # Required build tool.
 pkgs+=(ninja-build)     # Required build tool.
 pkgs+=(pipx)            # Package manager for Python applications.
 pkgs+=(python3-jinja2)  # Required build tool.
-pkgs+=(wget)            # Required build tool.
 pkgs+=(vim)             # Text editor.
+pkgs+=(wget)            # Required build tool.
 apt-get update
 apt-get install -y --no-install-recommends "${pkgs[@]}"
 apt-get clean
@@ -119,14 +119,20 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Add the distribution name and version, so they can be taken into account when
+# building dependencies. This requires setting the `os` field in the activated
+# profile where this image is used to the appropriate value.
+RUN <<EOF
+cat >> $(conan config home)/settings_user.yml <<EOT
+os:
+  ubuntu-${UBUNTU_VERSION}:
+EOT
+EOF
+
+# 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}"]
-core.package_id:default_build_mode=full_mode
-core.package_id:default_embed_mode=full_mode
-core.package_id:default_non_embed_mode=full_mode
 EOT
 EOF
 
@@ -205,14 +211,20 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Explicitly set the compiler flags and the distribution name and version.
+# Add the distribution name and version, so they can be taken into account when
+# building dependencies. This requires setting the `os` field in the activated
+# profile where this image is used to the appropriate value.
+RUN <<EOF
+cat >> $(conan config home)/settings_user.yml <<EOT
+os:
+  ubuntu-${UBUNTU_VERSION}:
+EOT
+EOF
+
+# 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}"]
-core.package_id:default_build_mode=full_mode
-core.package_id:default_embed_mode=full_mode
-core.package_id:default_non_embed_mode=full_mode
 EOT
 EOF
 

docker/ubuntu/README.md

@@ -41,7 +41,7 @@ registry.
 ```shell
 UBUNTU_VERSION=noble
 GCC_VERSION=14
-CONAN_VERSION=2.18.0
+CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc-${GCC_VERSION}
 
@@ -65,7 +65,7 @@ registry.
 ```shell
 UBUNTU_VERSION=noble
 CLANG_VERSION=18
-CONAN_VERSION=2.18.0
+CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
 CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}