Merge branch 'main' into bthomee/jinja

Author: bthomee

README.md

@@ -11,6 +11,10 @@ to build, run unit tests, and package different XRPLF projects. By using the sam
 for different projects, we are enforcing that XRPLF projects can be built in a wide selection
 of environments and using different C++ compilers.
 
+[Ubuntu instructions](docker/ubuntu/README.md)
+[Debian instructions](docker/debian/README.md)
+[RHEL instructions](docker/rhel/README.md)
+
 ## Tools images
 
 Aside from build images, XRPLF projects also use container images with specialized tools, e.g.

docker/debian/Dockerfile

@@ -43,6 +43,7 @@ pkgs+=(dpkg-dev)        # Required packaging tool.
 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+=(libc6-dev)       # Required build tool.
 pkgs+=(ninja-build)     # Required build tool.
@@ -121,7 +122,11 @@ EOF
 
 # Switch to the non-root user.
 USER ${NONROOT_USER}
-WORKDIR /home/${NONROOT_USER}
+ENV HOME=/home/${NONROOT_USER}
+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.
 RUN <<EOF
@@ -191,7 +196,11 @@ EOF
 
 # Switch to the non-root user.
 USER ${NONROOT_USER}
-WORKDIR /home/${NONROOT_USER}
+ENV HOME=/home/${NONROOT_USER}
+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.
 RUN <<EOF

docker/rhel/Dockerfile

@@ -18,6 +18,7 @@ pkgs+=(cmake)            # Required build tool.
 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+=(libstdc++-static) # Required to statically link libraries into rippled.
 pkgs+=(ninja-build)      # Required build tool.
@@ -27,7 +28,7 @@ pkgs+=(python3-pip)      # Package manager for Python applications.
 pkgs+=(rpm-build)        # Required packaging tool.
 pkgs+=(rpmdevtools)      # Required packaging tool.
 pkgs+=(wget)             # Required build tool.
-dnf install -y --setopt=tsflags=nodocs "${pkgs[@]}"
+dnf install -y --allowerasing --setopt=tsflags=nodocs "${pkgs[@]}"
 dnf clean -y all
 rm -rf /var/cache/dnf/*
 EOF
@@ -84,11 +85,11 @@ EOF
 
 # Switch to the non-root user.
 USER ${NONROOT_USER}
-WORKDIR /home/${NONROOT_USER}
+ENV HOME=/home/${NONROOT_USER}
+WORKDIR ${HOME}
 
-# Fix the Conan user home directory as it otherwise will point to the
-# /opt/app-root/src/.conan2 directory.
-ENV CONAN_HOME=/home/${NONROOT_USER}/.conan2
+# Set Conan home directory, so the users of this image can find default profile
+ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
 RUN <<EOF
@@ -167,11 +168,11 @@ EOF
 
 # Switch to the non-root user.
 USER ${NONROOT_USER}
-WORKDIR /home/${NONROOT_USER}
+ENV HOME=/home/${NONROOT_USER}
+WORKDIR ${HOME}
 
-# Fix the Conan user home directory as it otherwise will point to the
-# /opt/app-root/src/.conan2 directory.
-ENV CONAN_HOME=/home/${NONROOT_USER}/.conan2
+# Set Conan home directory, so the users of this image can find default profile
+ENV CONAN_HOME=${HOME}/.conan2
 
 # Create a default Conan profile.
 RUN <<EOF

docker/tools-rippled/Dockerfile

@@ -28,6 +28,7 @@ pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by provi
 pkgs+=(curl)            # Dependency for tools requiring downloading data.
 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+=(pipx)            # Package manager for Python applications.
 pkgs+=(wget)            # Required build tool.
@@ -58,4 +59,5 @@ RUN pipx install --pip-args='--no-cache' clang-format==${CLANG_FORMAT_VERSION} &
 
 # Switch to the non-root user.
 USER ${NONROOT_USER}
-WORKDIR /home/${NONROOT_USER}
+ENV HOME=/home/${NONROOT_USER}
+WORKDIR ${HOME}

docker/ubuntu/Dockerfile

@@ -32,6 +32,7 @@ pkgs+=(dpkg-dev)        # Required packaging tool.
 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+=(libc6-dev)       # Required build tool.
 pkgs+=(ninja-build)     # Required build tool.
@@ -101,7 +102,11 @@ EOF
 
 # Switch to the non-root user.
 USER ${NONROOT_USER}
-WORKDIR /home/${NONROOT_USER}
+ENV HOME=/home/${NONROOT_USER}
+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.
 RUN <<EOF
@@ -184,7 +189,11 @@ EOF
 
 # Switch to the non-root user.
 USER ${NONROOT_USER}
-WORKDIR /home/${NONROOT_USER}
+ENV HOME=/home/${NONROOT_USER}
+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.
 RUN <<EOF