Add Debian Bullseye with GCC 12

Author: Bronek

.github/workflows/debian.yml

@@ -36,6 +36,9 @@ jobs:
           - platform: linux/arm64
             runner: ubuntu-24.04-arm
         os:
+          - release: bullseye
+            compiler_name: gcc
+            compiler_version: 12
           - release: bookworm
             compiler_name: gcc
             compiler_version: 12
@@ -144,6 +147,9 @@ jobs:
     strategy:
       matrix:
         os:
+          - release: bullseye
+            compiler_name: gcc
+            compiler_version: 12
           - release: bookworm
             compiler_name: gcc
             compiler_version: 12

docker/debian/Dockerfile

@@ -37,18 +37,18 @@ EOF
 RUN <<EOF
 pkgs=()
 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+=(dpkg-dev)        # Required packaging tool.
+pkgs+=(debhelper)       # 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)              # 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+=(python3-venv)    # Python environment management tool.
+pkgs+=(python3-pip)     # Package manager for Python applications.
 pkgs+=(vim)             # Text editor.
 pkgs+=(wget)            # Required build tool.
 apt-get update
@@ -60,11 +60,15 @@ EOF
 # Install Python-based tools.
 ARG CONAN_VERSION
 ARG GCOVR_VERSION
-ENV PIPX_HOME=/opt/pipx \
-    PIPX_BIN_DIR=/usr/bin \
-    PIPX_MAN_DIR=/usr/share/man
-RUN pipx install --pip-args='--no-cache' conan==${CONAN_VERSION} && \
-    pipx install --pip-args='--no-cache' gcovr==${GCOVR_VERSION}
+ARG CMAKE_VERSION
+
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv ${VIRTUAL_ENV}
+ENV PATH=${VIRTUAL_ENV}/bin:${PATH}
+RUN pip install --no-cache \
+  conan==${CONAN_VERSION} \
+  gcovr==${GCOVR_VERSION} \
+  cmake==${CMAKE_VERSION}
 
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
@@ -83,6 +87,13 @@ 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
+dpkg-divert --divert /usr/bin/gcc-ar.orig --rename /usr/bin/gcc-ar
+dpkg-divert --divert /usr/bin/gcc-nm.orig --rename /usr/bin/gcc-nm
+dpkg-divert --divert /usr/bin/gcc-ranlib.orig --rename /usr/bin/gcc-ranlib
+dpkg-divert --divert /usr/bin/gcov.orig --rename /usr/bin/gcov
+dpkg-divert --divert /usr/bin/gcov-tool.orig --rename /usr/bin/gcov-tool
+dpkg-divert --divert /usr/bin/gcov-dump.orig --rename /usr/bin/gcov-dump
+dpkg-divert --divert /usr/bin/lto-dump.orig --rename /usr/bin/lto-dump
 update-alternatives \
   --install /usr/bin/cc cc /usr/local/bin/gcc 999
 update-alternatives \

docker/debian/README.md

@@ -29,12 +29,7 @@ versions by specifying the `DEBIAN_VERSION` build argument. There are additional
 arguments to specify as well, namely `GCC_VERSION` for the GCC flavor and
 `CLANG_VERSION` for the Clang flavor.
 
-None of the build images support packaging, since (in order to be access the
-most recent official releases) the compilers are installed from external
-sources:
-
-* [gcc Docker Official Image](https://hub.docker.com/_/gcc)
-* [LLVM Debian/Ubuntu nightly packages](https://apt.llvm.org/)
+Build image for `gcc` supports packaging.
 
 In order to build an image, run the commands below from the root directory of
 the repository.
@@ -49,6 +44,7 @@ DEBIAN_VERSION=bookworm
 GCC_VERSION=12
 CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
+CMAKE_VERSION=3.31.6
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc-${GCC_VERSION}
 
 docker buildx build . \
@@ -60,6 +56,7 @@ docker buildx build . \
   --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
   --build-arg GCC_VERSION=${GCC_VERSION} \
   --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
+  --build-arg CMAKE_VERSION=${CMAKE_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
 ```
 
@@ -73,6 +70,7 @@ DEBIAN_VERSION=bookworm
 CLANG_VERSION=17
 CONAN_VERSION=2.19.1
 GCOVR_VERSION=8.3
+CMAKE_VERSION=3.31.6
 CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
 
 docker buildx build . \
@@ -84,6 +82,7 @@ docker buildx build . \
   --build-arg CONAN_VERSION=${CONAN_VERSION} \
   --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
   --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
+  --build-arg CMAKE_VERSION=${CMAKE_VERSION} \
   --tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
 ```