f

Author: legleux

docker/debian/Dockerfile

@@ -50,7 +50,7 @@ apt update
 apt install -y "${pkgs[@]}"
 EOF
 
-# Install Conan && gcovr
+# Install Conan && gcovr.
 ARG CONAN_VERSION=2.18.0
 ARG GCOVR_VERSION=8.2
 ENV PIPX_HOME=/opt/pipx \

docker/rhel/Dockerfile

@@ -37,7 +37,7 @@ EOF
 COPY --from=rocky /usr/bin/bison /usr/bin/bison
 COPY --from=rocky /usr/bin/flex /usr/bin/flex
 
-# Install Conan && gcovr
+# Install Conan && gcovr.
 ARG CONAN_VERSION=2.18.0
 ARG GCOVR_VERSION=8.2
 ENV PIPX_HOME=/opt/pipx \

docker/ubuntu/Dockerfile

@@ -1,40 +1,45 @@
 # ====================== BASE IMAGE ======================
-ARG UBUNTU_VERSION=jammy
+ARG UBUNTU_VERSION
 FROM ubuntu:${UBUNTU_VERSION} AS base
 
-# Use Bash as the default shell for RUN commands.
+# Use Bash as the default shell for RUN commands and as the entrypoint.
 SHELL ["/bin/bash", "-c"]
-
-# Associate the image with the repository.
-ARG GITHUB_REPO=XRPLF/ci
-LABEL org.opencontainers.image.source=https://github.com/${GITHUB_REPO}
+ENTRYPOINT ["/bin/bash"]
 
 # Ensure any packages installed directly or indirectly via dpkg do not require
 # manual interaction.
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt update && apt upgrade -y
-RUN set -ex ;\
-    ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime ;\
-    apt install -y tzdata ;\
-    dpkg-reconfigure --frontend noninteractive tzdata
+RUN <<EOF
+set -ex
+ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
+apt update
+apt upgrade -y
+apt install -y tzdata
+dpkg-reconfigure --frontend noninteractive tzdata
+EOF
 
-# Install tools that are shared by all stages.
+# Install tools that are shared by all stages. Run `apt update` again before
+# installing the packages to ensure the package lists are up-to-date, which is
+# especially important when the image is built from a cached layer.
 RUN <<EOF
-    pkgs=()
-    pkgs+=(build-essential) # Required build tools.
-    pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
-    pkgs+=(cmake)           # Required build tool.
-    pkgs+=(curl)            # Dependency for tools requiring downloading data.
-    pkgs+=(file)            # Required packaging tool.
-    pkgs+=(git)             # Required build tool.
-    pkgs+=(gpg)             # Dependency for tools requiring signing or encrypting/decrypting.
-    pkgs+=(jq)              # Pretty printing.
-    pkgs+=(ninja-build)     # Required build tool.
-    pkgs+=(pipx)            # Package manager for Python applications.
-    apt install -y "${pkgs[@]}"
+pkgs=()
+pkgs+=(bison)           # Required build tool.
+pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
+pkgs+=(cmake)           # Required build tool.
+pkgs+=(curl)            # Dependency for tools requiring downloading data.
+pkgs+=(flex)            # Required build tool.
+pkgs+=(git)             # Required build tool.
+pkgs+=(gpg)             # Dependency for tools requiring signing or encrypting/decrypting.
+pkgs+=(jq)              # Pretty printing.
+pkgs+=(libc6-dev)       # Required build tool.
+pkgs+=(ninja-build)     # Required build tool.
+pkgs+=(pipx)            # Package manager for Python applications.
+pkgs+=(wget)            # Required build tool.
+apt update
+apt install -y "${pkgs[@]}"
 EOF
 
-# Install Conan && gcovr
+# Install Conan && gcovr.
 ARG CONAN_VERSION=2.18.0
 ARG GCOVR_VERSION=8.2
 ENV PIPX_HOME=/opt/pipx \
@@ -44,17 +49,17 @@ RUN pipx install conan==${CONAN_VERSION} && \
     pipx install gcovr==${GCOVR_VERSION}
 
 # Create the user to switch to, once all packages have been installed.
-ARG NONROOT_USER=ci
+ARG NONROOT_USER
 RUN useradd -ms /bin/bash ${NONROOT_USER}
 
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
 # Install GCC.
-ARG GCC_VERSION=12
+ARG GCC_VERSION
 RUN apt install -y gcc-${GCC_VERSION} g++-${GCC_VERSION}
 ENV CC=/usr/bin/gcc-${GCC_VERSION}
-ENV CXX=/usr/bin/gcc-${GCC_VERSION}
+ENV CXX=/usr/bin/g++-${GCC_VERSION}
 
 # Clean up unnecessary files to reduce image size.
 RUN rm -rf /var/lib/apt/lists/* && apt clean
@@ -65,12 +70,23 @@ WORKDIR /home/${NONROOT_USER}
 
 # Create a default Conan profile.
 RUN conan profile detect
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ~/.conan2/profiles/default
+# Explicitly set the compiler flags.
+RUN <<EOF
+cat >>~/.conan2/profiles/default <<EOT
+[conf]
+tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+EOT
+EOF
+# Print the Conan profile to verify the configuration.
+RUN conan profile show
 
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
 # Install Clang.
-ARG CLANG_VERSION=16
+ARG CLANG_VERSION
 RUN apt install -y clang-${CLANG_VERSION} llvm-${CLANG_VERSION}
 ENV CC=/usr/bin/clang-${CLANG_VERSION}
 ENV CXX=/usr/bin/clang++-${CLANG_VERSION}
@@ -84,3 +100,26 @@ WORKDIR /home/${NONROOT_USER}
 
 # Create a default Conan profile.
 RUN conan profile detect
+# Fix the C++ dialect.
+RUN sed -i -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ~/.conan2/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
+cat >>~/.conan2/profiles/default <<EOT
+[conf]
+tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+EOT
+if [[ $(clang-${CLANG_VERSION} --version | head -1 | grep -Po 'version \K[0-9]{2}') -ge 20 ]]; then
+    cat >>~/.conan2/profiles/default <<EOT
+tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw', '-Wno-deprecated-declarations']
+EOT
+elif [[ $(clang-${CLANG_VERSION} --version | head -1 | grep -Po 'version \K[0-9]{2}') -eq 19 ]]; then
+    cat >>~/.conan2/profiles/default <<EOT
+tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
+EOT
+fi
+EOF
+# Print the Conan profile to verify the configuration.
+RUN conan profile show