From 6c1d2fe97a91a5010c2b0a52f059d67ad27aab4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 09:55:37 +0200 Subject: [PATCH 01/17] bump versions --- containers/Dockerfile.EESSI-build-node-debian11 | 8 ++++---- containers/Dockerfile.EESSI-build-node-debian12 | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian11 b/containers/Dockerfile.EESSI-build-node-debian11 index a31c78fb..d2bc4ce0 100644 --- a/containers/Dockerfile.EESSI-build-node-debian11 +++ b/containers/Dockerfile.EESSI-build-node-debian11 @@ -1,15 +1,15 @@ -ARG cvmfsversion=2.13.3 -ARG awscliversion=1.32.22 +ARG cvmfsversion=2.14.1 +ARG awscliversion=1.46.2 ARG fuseoverlayfsversion=1.10 ARG bwrapversion=0.11.0 -FROM debian:11.7 AS prepare-deb +FROM debian:11.11 AS prepare-deb ARG cvmfsversion COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} -FROM debian:11.5 +FROM debian:11.11 ARG cvmfsversion ARG awscliversion ARG fuseoverlayfsversion diff --git a/containers/Dockerfile.EESSI-build-node-debian12 b/containers/Dockerfile.EESSI-build-node-debian12 index 3f8c339d..3a6e0920 100644 --- a/containers/Dockerfile.EESSI-build-node-debian12 +++ b/containers/Dockerfile.EESSI-build-node-debian12 @@ -1,15 +1,15 @@ -ARG cvmfsversion=2.13.3 -ARG awscliversion=1.40.35 -ARG unionfsfuseversion=3.6 +ARG cvmfsversion=2.14.1 +ARG awscliversion=1.46.2 +ARG unionfsfuseversion=3.8 -FROM debian:12.11 AS prepare-deb +FROM debian:12.15 AS prepare-deb ARG cvmfsversion COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} -FROM debian:12.11 +FROM debian:12.15 ARG cvmfsversion ARG awscliversion ARG unionfsfuseversion From 50f98c1677636713a77fa98087fcb6f9fcba20eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 09:55:47 +0200 Subject: [PATCH 02/17] bump versions, use Debian 13 instead of Trixie --- containers/Dockerfile.EESSI-build-node-debian13 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian13 b/containers/Dockerfile.EESSI-build-node-debian13 index 8b391821..388dbd7e 100644 --- a/containers/Dockerfile.EESSI-build-node-debian13 +++ b/containers/Dockerfile.EESSI-build-node-debian13 @@ -1,15 +1,15 @@ -ARG cvmfsversion=2.13.3 -ARG awscliversion=1.45.52 -ARG unionfsfuseversion=3.7 +ARG cvmfsversion=2.14.1 +ARG awscliversion=1.46.2 +ARG unionfsfuseversion=3.8 # see https://hub.docker.com/_/debian/tags?name=trixie-20&ordering=last_updated -FROM debian:trixie-20260713-slim AS prepare-deb +FROM debian:13.7-slim AS prepare-deb ARG cvmfsversion COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} -FROM debian:trixie-20260713-slim +FROM debian:13.7-slim ARG cvmfsversion ARG awscliversion ARG unionfsfuseversion From 99117f8438ba17fafd530fb6d765bcf55b0157eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 09:57:05 +0200 Subject: [PATCH 03/17] bump CVMFS version --- containers/Dockerfile.EESSI-client-rocky8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/Dockerfile.EESSI-client-rocky8 b/containers/Dockerfile.EESSI-client-rocky8 index bd2b76e6..a40c91ab 100644 --- a/containers/Dockerfile.EESSI-client-rocky8 +++ b/containers/Dockerfile.EESSI-client-rocky8 @@ -1,4 +1,4 @@ -ARG cvmfsversion=2.13.3 +ARG cvmfsversion=2.14.1 # Stick to old version of fuse-overlayfs due to issues with newer versions # (cfr. https://github.com/containers/fuse-overlayfs/issues/232) ARG fuseoverlayfsversion=1.10 From 1ad9d743bd66d138a303875aa7e5f99537314681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:01:26 +0200 Subject: [PATCH 04/17] install wget --- containers/build-or-download-cvmfs-debs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index 166b6bf3..60ff3138 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -12,7 +12,7 @@ os="${distro}${release}" if [ "$arch" = "riscv64" ] then - apt-get install -y devscripts libfuse3-dev cmake cpio golang help2man libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools python3-dev python3-setuptools uuid-dev libz-dev lsb-release + apt-get install -y devscripts libfuse3-dev cmake cpio golang help2man libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools python3-dev python3-setuptools uuid-dev libz-dev lsb-release wget cd /tmp wget https://github.com/cvmfs/cvmfs/archive/refs/tags/cvmfs-${cvmfsversion}.tar.gz tar xzf cvmfs-${cvmfsversion}.tar.gz From d80f691a1cad13367d93c0c0f51807a8f9c80e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:05:51 +0200 Subject: [PATCH 05/17] revert changes in Debian 11 container --- containers/Dockerfile.EESSI-build-node-debian11 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian11 b/containers/Dockerfile.EESSI-build-node-debian11 index d2bc4ce0..a31c78fb 100644 --- a/containers/Dockerfile.EESSI-build-node-debian11 +++ b/containers/Dockerfile.EESSI-build-node-debian11 @@ -1,15 +1,15 @@ -ARG cvmfsversion=2.14.1 -ARG awscliversion=1.46.2 +ARG cvmfsversion=2.13.3 +ARG awscliversion=1.32.22 ARG fuseoverlayfsversion=1.10 ARG bwrapversion=0.11.0 -FROM debian:11.11 AS prepare-deb +FROM debian:11.7 AS prepare-deb ARG cvmfsversion COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} -FROM debian:11.11 +FROM debian:11.5 ARG cvmfsversion ARG awscliversion ARG fuseoverlayfsversion From 7738f3cf101acf6cc11b507440e9ea003e863410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:06:00 +0200 Subject: [PATCH 06/17] wget was already installed --- containers/build-or-download-cvmfs-debs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index 60ff3138..166b6bf3 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -12,7 +12,7 @@ os="${distro}${release}" if [ "$arch" = "riscv64" ] then - apt-get install -y devscripts libfuse3-dev cmake cpio golang help2man libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools python3-dev python3-setuptools uuid-dev libz-dev lsb-release wget + apt-get install -y devscripts libfuse3-dev cmake cpio golang help2man libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools python3-dev python3-setuptools uuid-dev libz-dev lsb-release cd /tmp wget https://github.com/cvmfs/cvmfs/archive/refs/tags/cvmfs-${cvmfsversion}.tar.gz tar xzf cvmfs-${cvmfsversion}.tar.gz From ab6a51a73efe1f5677c57d9d76edb5327d93e7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:09:13 +0200 Subject: [PATCH 07/17] remove Debian 11 container --- .github/workflows/build-publish-containers.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-publish-containers.yml b/.github/workflows/build-publish-containers.yml index 88b4266b..f54fb4cf 100644 --- a/.github/workflows/build-publish-containers.yml +++ b/.github/workflows/build-publish-containers.yml @@ -33,14 +33,12 @@ jobs: contents: read strategy: matrix: - tag: ['client:rocky8', 'build-node:debian11', 'build-node:debian12', 'build-node:debian13', 'client:ubuntu22.04-macOS-26'] + tag: ['client:rocky8', 'build-node:debian12', 'build-node:debian13', 'client:ubuntu22.04-macOS-26'] platform: [amd64, arm64, riscv64] exclude: # exclude images that don't support RISC-V - tag: client:rocky8 platform: riscv64 - - tag: build-node:debian11 - platform: riscv64 - tag: build-node:debian12 platform: riscv64 # limit the new macOS to arm64 only @@ -105,7 +103,7 @@ jobs: contents: read strategy: matrix: - tag: ['client:rocky8', 'build-node:debian11', 'build-node:debian12', 'build-node:debian13', 'client:ubuntu22.04-macOS-26'] + tag: ['client:rocky8', 'build-node:debian12', 'build-node:debian13', 'client:ubuntu22.04-macOS-26'] steps: - name: Login to GitHub Container Registry if: github.event_name != 'pull_request' From 916f23902106c94503ddc96993b87c6b140b1ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:30:43 +0200 Subject: [PATCH 08/17] add ENV DEBIAN_FRONTEND noninteractive --- containers/Dockerfile.EESSI-build-node-debian12 | 3 +++ containers/Dockerfile.EESSI-build-node-debian13 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/containers/Dockerfile.EESSI-build-node-debian12 b/containers/Dockerfile.EESSI-build-node-debian12 index 3a6e0920..f66b87b0 100644 --- a/containers/Dockerfile.EESSI-build-node-debian12 +++ b/containers/Dockerfile.EESSI-build-node-debian12 @@ -5,6 +5,7 @@ ARG unionfsfuseversion=3.8 FROM debian:12.15 AS prepare-deb ARG cvmfsversion +ENV DEBIAN_FRONTEND noninteractive COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} @@ -14,6 +15,8 @@ ARG cvmfsversion ARG awscliversion ARG unionfsfuseversion +ENV DEBIAN_FRONTEND noninteractive + COPY --from=prepare-deb /root/deb /root/deb RUN apt-get update diff --git a/containers/Dockerfile.EESSI-build-node-debian13 b/containers/Dockerfile.EESSI-build-node-debian13 index 388dbd7e..3574de30 100644 --- a/containers/Dockerfile.EESSI-build-node-debian13 +++ b/containers/Dockerfile.EESSI-build-node-debian13 @@ -5,6 +5,7 @@ ARG unionfsfuseversion=3.8 # see https://hub.docker.com/_/debian/tags?name=trixie-20&ordering=last_updated FROM debian:13.7-slim AS prepare-deb ARG cvmfsversion +ENV DEBIAN_FRONTEND noninteractive COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} @@ -14,6 +15,8 @@ ARG cvmfsversion ARG awscliversion ARG unionfsfuseversion +ENV DEBIAN_FRONTEND noninteractive + COPY --from=prepare-deb /root/deb /root/deb RUN apt-get update From efe99e5cc1d72775c445f71952fe8b8d4c2cccb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:45:26 +0200 Subject: [PATCH 09/17] use DEBIAN_FRONTEND=noninteractive instead --- containers/Dockerfile.EESSI-build-node-debian12 | 2 +- containers/Dockerfile.EESSI-build-node-debian13 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian12 b/containers/Dockerfile.EESSI-build-node-debian12 index f66b87b0..ab481e8b 100644 --- a/containers/Dockerfile.EESSI-build-node-debian12 +++ b/containers/Dockerfile.EESSI-build-node-debian12 @@ -5,7 +5,7 @@ ARG unionfsfuseversion=3.8 FROM debian:12.15 AS prepare-deb ARG cvmfsversion -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} diff --git a/containers/Dockerfile.EESSI-build-node-debian13 b/containers/Dockerfile.EESSI-build-node-debian13 index 3574de30..555b95c1 100644 --- a/containers/Dockerfile.EESSI-build-node-debian13 +++ b/containers/Dockerfile.EESSI-build-node-debian13 @@ -5,7 +5,7 @@ ARG unionfsfuseversion=3.8 # see https://hub.docker.com/_/debian/tags?name=trixie-20&ordering=last_updated FROM debian:13.7-slim AS prepare-deb ARG cvmfsversion -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive COPY ./containers/build-or-download-cvmfs-debs.sh /build-or-download-cvmfs-debs.sh RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion} From 9d1cb1150bde661e38a00ce91afae570a7511c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:47:28 +0200 Subject: [PATCH 10/17] add libarchive-dev nlohmann-json3-dev deps --- containers/build-or-download-cvmfs-debs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index 166b6bf3..e4daad2a 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -12,7 +12,7 @@ os="${distro}${release}" if [ "$arch" = "riscv64" ] then - apt-get install -y devscripts libfuse3-dev cmake cpio golang help2man libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools python3-dev python3-setuptools uuid-dev libz-dev lsb-release + apt-get install -y devscripts libfuse3-dev cmake cpio golang help2man libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools python3-dev python3-setuptools uuid-dev libz-dev lsb-release libarchive-dev nlohmann-json3-dev cd /tmp wget https://github.com/cvmfs/cvmfs/archive/refs/tags/cvmfs-${cvmfsversion}.tar.gz tar xzf cvmfs-${cvmfsversion}.tar.gz From 21bc590a8676daaea31793f7e89f467cb7cac39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:55:44 +0200 Subject: [PATCH 11/17] add yum update --- containers/Dockerfile.EESSI-client-rocky8 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/containers/Dockerfile.EESSI-client-rocky8 b/containers/Dockerfile.EESSI-client-rocky8 index a40c91ab..58e68cad 100644 --- a/containers/Dockerfile.EESSI-client-rocky8 +++ b/containers/Dockerfile.EESSI-client-rocky8 @@ -11,6 +11,7 @@ RUN sh /build-or-download-cvmfs-rpms.sh ${cvmfsversion} FROM rockylinux:8 AS build-fuse-overlayfs ARG fuseoverlayfsversion +RUN yum update -y RUN yum install -y wget fuse3-devel autoconf automake gcc make tar RUN wget https://github.com/containers/fuse-overlayfs/archive/refs/tags/v${fuseoverlayfsversion}.tar.gz \ && tar xzf v${fuseoverlayfsversion}.tar.gz \ @@ -24,6 +25,7 @@ ARG cvmfsversion COPY --from=prepare-rpm /root/rpmbuild/RPMS /root/rpmbuild/RPMS COPY --from=build-fuse-overlayfs /usr/local/bin/fuse-overlayfs /usr/local/bin/fuse-overlayfs +RUN yum update -y RUN yum install -y sudo vim openssh-clients lsof strace squashfs-tools RUN elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2)" \ && yum install -y /root/rpmbuild/RPMS/$(uname -m)/cvmfs-${cvmfsversion}-1.${elversion}.$(uname -m).rpm \ From 55093c3858f6af44ca425a1d860aecc39ed4b99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:57:09 +0200 Subject: [PATCH 12/17] add apt-get upgrade to Debian containers --- containers/Dockerfile.EESSI-build-node-debian12 | 2 +- containers/Dockerfile.EESSI-build-node-debian13 | 2 +- containers/build-or-download-cvmfs-debs.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian12 b/containers/Dockerfile.EESSI-build-node-debian12 index ab481e8b..d943f67f 100644 --- a/containers/Dockerfile.EESSI-build-node-debian12 +++ b/containers/Dockerfile.EESSI-build-node-debian12 @@ -19,7 +19,7 @@ ENV DEBIAN_FRONTEND noninteractive COPY --from=prepare-deb /root/deb /root/deb -RUN apt-get update +RUN apt-get update && apt-get upgrade RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev lsof strace zstd # python3 and jq are required for eessi-upload-to-staging script (next to awscli) RUN apt-get install -y python3-pip jq diff --git a/containers/Dockerfile.EESSI-build-node-debian13 b/containers/Dockerfile.EESSI-build-node-debian13 index 555b95c1..ac886d5e 100644 --- a/containers/Dockerfile.EESSI-build-node-debian13 +++ b/containers/Dockerfile.EESSI-build-node-debian13 @@ -19,7 +19,7 @@ ENV DEBIAN_FRONTEND noninteractive COPY --from=prepare-deb /root/deb /root/deb -RUN apt-get update +RUN apt-get update && apt-get upgrade RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev lsof strace zstd # python3 and jq are required for eessi-upload-to-staging script (next to awscli) RUN apt-get install -y python3-pip jq diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index e4daad2a..5b108bb0 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -2,7 +2,7 @@ cvmfsversion=$1 arch=$(dpkg --print-architecture) -apt-get update +apt-get update && apt-get upgrade apt-get install -y wget lsb-release distro=$(lsb_release -si | tr [:upper:] [:lower:]) From 9b911797188b32a256ac89487eb45d98dc6f9d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 10:58:19 +0200 Subject: [PATCH 13/17] add yum update --- containers/build-or-download-cvmfs-rpms.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/build-or-download-cvmfs-rpms.sh b/containers/build-or-download-cvmfs-rpms.sh index d3a10ad6..8ab05680 100644 --- a/containers/build-or-download-cvmfs-rpms.sh +++ b/containers/build-or-download-cvmfs-rpms.sh @@ -2,6 +2,7 @@ cvmfsversion=$1 arch=$(uname -m) yum install -y wget +yum update -y elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2)" if [ "$arch" = "riscv64" ] then From 6b9f847c07f45e924d1ce4fce76bb2ef7e44f73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 11:01:10 +0200 Subject: [PATCH 14/17] add -y to apt-get upgrade --- containers/Dockerfile.EESSI-build-node-debian12 | 2 +- containers/Dockerfile.EESSI-build-node-debian13 | 2 +- containers/build-or-download-cvmfs-debs.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian12 b/containers/Dockerfile.EESSI-build-node-debian12 index d943f67f..a7e7265f 100644 --- a/containers/Dockerfile.EESSI-build-node-debian12 +++ b/containers/Dockerfile.EESSI-build-node-debian12 @@ -19,7 +19,7 @@ ENV DEBIAN_FRONTEND noninteractive COPY --from=prepare-deb /root/deb /root/deb -RUN apt-get update && apt-get upgrade +RUN apt-get update && apt-get upgrade -y RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev lsof strace zstd # python3 and jq are required for eessi-upload-to-staging script (next to awscli) RUN apt-get install -y python3-pip jq diff --git a/containers/Dockerfile.EESSI-build-node-debian13 b/containers/Dockerfile.EESSI-build-node-debian13 index ac886d5e..5293fa90 100644 --- a/containers/Dockerfile.EESSI-build-node-debian13 +++ b/containers/Dockerfile.EESSI-build-node-debian13 @@ -19,7 +19,7 @@ ENV DEBIAN_FRONTEND noninteractive COPY --from=prepare-deb /root/deb /root/deb -RUN apt-get update && apt-get upgrade +RUN apt-get update && apt-get upgrade -y RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev lsof strace zstd # python3 and jq are required for eessi-upload-to-staging script (next to awscli) RUN apt-get install -y python3-pip jq diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index 5b108bb0..ac52dc02 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -2,7 +2,7 @@ cvmfsversion=$1 arch=$(dpkg --print-architecture) -apt-get update && apt-get upgrade +apt-get update && apt-get upgrade -y apt-get install -y wget lsb-release distro=$(lsb_release -si | tr [:upper:] [:lower:]) From e769e7a7408927c5dc06a4a7a16d0aee11dd3456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 11:02:03 +0200 Subject: [PATCH 15/17] add apt-get upgrade -y --- containers/Dockerfile.EESSI-client-ubuntu22.04-macOS-26 | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/Dockerfile.EESSI-client-ubuntu22.04-macOS-26 b/containers/Dockerfile.EESSI-client-ubuntu22.04-macOS-26 index 841b5005..58085224 100644 --- a/containers/Dockerfile.EESSI-client-ubuntu22.04-macOS-26 +++ b/containers/Dockerfile.EESSI-client-ubuntu22.04-macOS-26 @@ -12,6 +12,7 @@ ARG GID=20 RUN set -eux; \ apt-get update -o Acquire::Retries=5 -o Acquire::http::Timeout=30; \ + apt-get upgrade -y; \ apt-get install -y --no-install-recommends \ ca-certificates \ wget \ From a33af509cf063c7607fdda492a5a2db44ecf2eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 11:10:46 +0200 Subject: [PATCH 16/17] transform el8_10 into el8 --- containers/build-or-download-cvmfs-rpms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/build-or-download-cvmfs-rpms.sh b/containers/build-or-download-cvmfs-rpms.sh index 8ab05680..45f15033 100644 --- a/containers/build-or-download-cvmfs-rpms.sh +++ b/containers/build-or-download-cvmfs-rpms.sh @@ -3,7 +3,7 @@ arch=$(uname -m) yum install -y wget yum update -y -elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2)" +elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2 | cut -d '_' -f 1)" if [ "$arch" = "riscv64" ] then yum install -y epel-release From e44a4fdb366e2112c5fa2913b6dc78ee13b88496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 23 Oct 2026 11:18:27 +0200 Subject: [PATCH 17/17] transform el8_10 into el8 --- containers/Dockerfile.EESSI-client-rocky8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/Dockerfile.EESSI-client-rocky8 b/containers/Dockerfile.EESSI-client-rocky8 index 58e68cad..d64dc01f 100644 --- a/containers/Dockerfile.EESSI-client-rocky8 +++ b/containers/Dockerfile.EESSI-client-rocky8 @@ -27,7 +27,7 @@ COPY --from=build-fuse-overlayfs /usr/local/bin/fuse-overlayfs /usr/local/bin/fu RUN yum update -y RUN yum install -y sudo vim openssh-clients lsof strace squashfs-tools -RUN elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2)" \ +RUN elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2 | cut -d '_' -f 1)" \ && yum install -y /root/rpmbuild/RPMS/$(uname -m)/cvmfs-${cvmfsversion}-1.${elversion}.$(uname -m).rpm \ /root/rpmbuild/RPMS/$(uname -m)/cvmfs-fuse3-${cvmfsversion}-1.${elversion}.$(uname -m).rpm \ /root/rpmbuild/RPMS/$(uname -m)/cvmfs-libs-${cvmfsversion}-1.${elversion}.$(uname -m).rpm \