resolves 60: update workflow for debian:13

.github/workflows/feelpp-env.yml

@@ -12,7 +12,7 @@ on:
       dist:
         description: 'Distribution codename'     
         required: true
-        default: 'jammy'
+        default: 'noble'
         type: string
       flavor:
         description: 'Flavor of the distribution'  
@@ -22,7 +22,7 @@ on:
       version:
         description: 'Version of the distribution'  
         required: true
-        default: '22.04'
+        default: '24.04'
         type: string
       dockerfile:
         description: 'Dockerfile to use'  
@@ -35,8 +35,6 @@ on:
         default: 'linux/amd64,linux/arm64'
         type: string
 
-
-
 jobs:
 
   activate:
@@ -48,74 +46,67 @@ jobs:
     steps:
     - run: echo ok go
 
-
   all_images:
     if: ${{ github.event_name == 'push' && !contains(github.event.head_commit.message, 'all skip') }} 
     strategy:
       fail-fast: true
       max-parallel: 4
       matrix: 
         include:
-          - {service: feelpp-env, dist: focal, flavor: ubuntu, version: "20.04", tag: ubuntu-20.04, experimental: false, platforms: "linux/amd64", dockerfile: Dockerfile }
-          - {service: feelpp-env, dist: mantic, flavor: ubuntu, version: "23.10", tag: ubuntu-23.10, experimental: false, platforms: "linux/amd64", dockerfile: Dockerfile }
-          - {service: feelpp-env, dist: jammy, flavor: ubuntu, version: "22.04", tag: ubuntu-22.04, experimental: false, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile }
-          - {service: feelpp-env, dist: noble, flavor: ubuntu, version: "24.04", tag: ubuntu-24.04, experimental: true, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile }
-#          - {service: feelpp-env, dist: buster, flavor: debian, version: 10, tag: debian-10, experimental: false, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile }
-#          - {service: feelpp-env, dist: bullseye, flavor: debian, version: "11", tag: debian-11, experimental: false, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile }
-          - {service: feelpp-env, dist: bookworm, flavor: debian, version: "12", tag: debian-12, experimental: false, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile }
-          - {service: feelpp-env, dist: debian-testing, flavor: debian, version: "testing", tag: debian-testing, experimental: true, platforms: "linux/amd64", dockerfile: Dockerfile }
-          - {service: feelpp-env, dist: debian-sid, flavor: debian, version: "sid", tag: debian-sid, experimental: true, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile }
-          - {service: feelpp-env, dist: fedora-39, flavor: fedora, version: "39", tag: fedora-39, experimental: false, platforms: "linux/amd64", dockerfile: Dockerfile }
+#          - {service: feelpp-env, dist: focal,  flavor: ubuntu, version: "20.04", tag: ubuntu-20.04, experimental: false, platforms: "linux/amd64",                    dockerfile: Dockerfile }
+#          - {service: feelpp-env, dist: mantic, flavor: ubuntu, version: "23.10", tag: ubuntu-23.10, experimental: false, platforms: "linux/amd64",                    dockerfile: Dockerfile }
+          - {service: feelpp-env, dist: jammy,  flavor: ubuntu, version: "22.04", tag: ubuntu-22.04, experimental: false, platforms: "linux/amd64",        dockerfile: Dockerfile }
+          - {service: feelpp-env, dist: noble,  flavor: ubuntu, version: "24.04", tag: ubuntu-24.04, experimental: true,  platforms: "linux/amd64,linux/arm64",        dockerfile: Dockerfile }
+#         - {service: feelpp-env, dist: buster, flavor: debian, version: "10",    tag: debian-10,   experimental: false, platforms: "linux/amd64,linux/arm64",        dockerfile: Dockerfile }
+#         - {service: feelpp-env, dist: bullseye, flavor: debian, version: "11",  tag: debian-11,   experimental: false, platforms: "linux/amd64,linux/arm64",        dockerfile: Dockerfile }
+          - {service: feelpp-env, dist: bookworm, flavor: debian, version: "12",  tag: debian-12,   experimental: false, platforms: "linux/amd64",        dockerfile: Dockerfile }
+          - {service: feelpp-env, dist: trixie,   flavor: debian, version: "13",  tag: debian-13,   experimental: false, platforms: "linux/amd64,linux/arm64",        dockerfile: Dockerfile }
+          - {service: feelpp-env, dist: debian-testing, flavor: debian, version: "testing", tag: debian-testing, experimental: true, platforms: "linux/amd64",        dockerfile: Dockerfile }
+          - {service: feelpp-env, dist: debian-sid,      flavor: debian, version: "sid",     tag: debian-sid,     experimental: true, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile }
+          - {service: feelpp-env, dist: fedora-42, flavor: fedora, version: "42", tag: fedora-42, experimental: false, platforms: "linux/amd64",                     dockerfile: Dockerfile }
     runs-on: self-docker
     needs: activate
     name: ${{ matrix.flavor }}-${{ matrix.version }}
     continue-on-error: ${{ matrix.experimental }}
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v5
       with:
-#        lfs: true  
         token: ${{ secrets.CR_PAT }}
         submodules: recursive
     - name: generate
       run: |
-        bash mkimg.sh  -f ${{ matrix.flavor }}:${{ matrix.version }} -t feelpp/${{ matrix.service }}:${{ matrix.tag }}  --
-        echo "context=feelpp-env/$(bash mkimg.sh  -f ${{ matrix.flavor }}:${{ matrix.version }} -t feelpp/${{ matrix.service }}:${{ matrix.tag }}  --)" >> $GITHUB_OUTPUT
-        ls -lrt
+          dir="$(bash mkimg.sh -f ${{ matrix.flavor }}:${{ matrix.version }} -t feelpp/${{ matrix.service }}:${{ matrix.tag }})"
+          echo "context=feelpp-env/${dir}" >> "$GITHUB_OUTPUT"
+          ls -lrt
       id: generate
       working-directory: feelpp-env
-    -
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-    -
-      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2        
-    - 
-      name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.CR_PAT }}
-    - 
-      name: Build ${{ matrix.service }}:${{ matrix.tag }}
-      uses: docker/build-push-action@v3
+    - name: Build ${{ matrix.service }}:${{ matrix.tag }}
+      uses: docker/build-push-action@v6
       with: 
         context: ./${{ steps.generate.outputs.context }}
         tags: ghcr.io/feelpp/${{ matrix.service }}:${{ matrix.tag }}
         file: ./${{ steps.generate.outputs.context }}/${{ matrix.dockerfile }}
         push: ${{ github.event_name != 'pull_request' }}
         platforms: ${{ matrix.platforms }}
-    - 
-      name: Trigger build runner:${{ matrix.tag }}
+    - name: Trigger build runner:${{ matrix.tag }}
       uses: peter-evans/repository-dispatch@v2
       with:
         token: ${{ secrets.CR_PAT }}
         repository: feelpp/runners
         event-type: runner-update-baseimage
         client-payload: '{"flavor":"${{ matrix.flavor }}","version":"${{ matrix.version }}"}'
 
-
   one_image:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     runs-on: self-docker
@@ -125,42 +116,36 @@ jobs:
       tag: ${{ inputs.flavor }}-${{ inputs.version }}
       service: feelpp-env
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v5
       with:
-#        lfs: true  
         token: ${{ secrets.CR_PAT }}
         submodules: recursive
     - name: generate
       run: |
-        bash mkimg.sh  -f ${{ inputs.flavor }}:${{ inputs.version }} -t feelpp/${{ env.service }}:${{ env.tag }}  --
-        echo "context=feelpp-env/$(bash mkimg.sh  -f ${{ inputs.flavor }}:${{ inputs.version }} -t feelpp/${{ env.service }}:${{ env.tag }}  --)" >> $GITHUB_OUTPUT
-        ls -lrt
+          dir="$(bash mkimg.sh -f ${{ inputs.flavor }}:${{ inputs.version }} -t feelpp/${{ env.service }}:${{ env.tag }})"
+          echo "context=feelpp-env/${dir}" >> "$GITHUB_OUTPUT"
+          ls -lrt
       id: generate
       working-directory: feelpp-env
-    -
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-    -
-      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2        
-    - 
-      name: Login to GitHub Container Registry
-      uses: docker/login-action@v2 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.CR_PAT }}
-    - 
-      name: Build ${{ env.service }}:${{ env.tag }}
-      uses: docker/build-push-action@v3
+    - name: Build ${{ env.service }}:${{ env.tag }}
+      uses: docker/build-push-action@v6
       with: 
         context: ./${{ steps.generate.outputs.context }}
         tags: ghcr.io/feelpp/${{ env.service }}:${{ env.tag }}
         file: ./${{ steps.generate.outputs.context }}/${{ inputs.dockerfile }}
         push: ${{ github.event_name != 'pull_request' }}
         platforms: ${{ inputs.platforms }}
-    - 
-      name: Trigger build runner:${{ env.tag }}
+    - name: Trigger build runner:${{ env.tag }}
       uses: peter-evans/repository-dispatch@v2
       with:
         token: ${{ secrets.CR_PAT }}

feelpp-env/Dockerfile-debian

@@ -1,12 +1,21 @@
-RUN if test -f /etc/apt/sources.list; then sed -i 's/http:\/\/deb.debian.org\/debian\//http:\/\/miroir.univ-lorraine.fr\/debian\//' /etc/apt/sources.list; fi
-RUN if test -f /etc/apt/sources.list; then sed -i 's/http:\/\/security.debian.org\/debian-security\//http:\/\/miroir.univ-lorraine.fr\/debian-security\//' /etc/apt/sources.list; fi
-
-
+ARG DEBIAN_MAIN_MIRROR=ftp.fr.debian.org   # override with --build-arg if needed
+#ARG DEBIAN_MAIN_MIRROR=miroir.univ-lorraine.fr
+RUN set -e; \
+  . /etc/os-release || true; \
+  case "${ID}:${VERSION_CODENAME}" in \
+    debian:bookworm|debian:trixie|debian:sid|debian:testing) \
+      f=/etc/apt/sources.list.d/debian.sources; \
+      echo "Switching main archive to http://${DEBIAN_MAIN_MIRROR}/debian (keeping security) in ${f}"; \
+      sed -i "0,/^URIs:\s*http:\/\/deb\.debian\.org\/debian/s//URIs: http:\/\/${DEBIAN_MAIN_MIRROR}\/debian/" "$f"; \
+      apt-get -qq update; \
+      ;; \
+    *) echo "Leaving APT sources untouched (ID=${ID} CODENAME=${VERSION_CODENAME}).";; \
+  esac
 
 
 RUN apt-get -qq update && \
-    apt-get -y --force-yes install \
-    software-properties-common gnupg \
+    apt-get -y  install \
+    gnupg \
     ca-certificates-java default-jre-headless \
     quilt  debhelper dh-python 
 
@@ -19,7 +28,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
 RUN apt-get -y install tzdata
 RUN apt-get -qq update && \
-    apt-get -y --force-yes install \
+    apt-get -y  install \
     quilt debhelper                                    \
     tree ne                                              \
     cmake                                             \
@@ -33,7 +42,7 @@ RUN apt-get -qq update && \
     libmetis-dev libscotch-dev \
     libeigen3-dev \
     petsc-dev                                       \
-    slepc-dev                                       \           
+    slepc-dev                                       \
     libhdf5-openmpi-dev                                         \
     libnlopt-dev                                                \
     libgsl-dev                                                  \
@@ -42,28 +51,35 @@ RUN apt-get -qq update && \
     libxml2-dev   libpugixml-dev                                          \
     libgmsh-dev gmsh                                       \
     bison flex                                              \
-    doxygen doxygen-latex                                  \
+    doxygen                                   \
     transfig imagemagick                                    \
     libtbb-dev                                  \
     libann-dev libglpk-dev                                 \
     libbz2-dev libzip-dev                                       \
     libbson-dev                                                 \
     libmongoc-dev                                               \
-    libmongoclient-dev                                          \
+    libmongo-client-dev                                          \
     python3-pymongo                                              \
-    ruby-progressbar                                            \
-    ruby-tilt                                                   \
-    asciidoctor ruby-asciidoctor-pdf                                                 \
     libglew-dev                                                  \
     python3-h5py python3-sympy  python3-mpi4py python3-numpy python3-petsc4py-real python3-slepc4py-real  python3-venv   \
     rsync \
+    gdb\
+    && apt-get autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN apt-get -qq update && \
+    apt-get -y --no-install-recommends -o APT::Install-Suggests=false install \
+    ruby-progressbar                                            \
+    ruby-tilt                                                   \
+    asciidoctor ruby-asciidoctor-pdf                                                 \
     docker.io jsonlint \
     man jq curl ruby ruby-dev \
-    gdb\
     && apt-get autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+
 ENV FEELPP_DEP_INSTALL_PREFIX /usr/local