Skip to content

Bump versions of tools and distros in EESSI build/client containers #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocaisa merged 17 commits into from
Oct 23, 2026
Merged

Bump versions of tools and distros in EESSI build/client containers #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6c1d2fe
bump versions
bedroge Oct 23, 2026
50f98c1
bump versions, use Debian 13 instead of Trixie
bedroge Oct 23, 2026
99117f8
bump CVMFS version
bedroge Oct 23, 2026
1ad9d74
install wget
bedroge Oct 23, 2026
d80f691
revert changes in Debian 11 container
bedroge Oct 23, 2026
7738f3c
wget was already installed
bedroge Oct 23, 2026
ab6a51a
remove Debian 11 container
bedroge Oct 23, 2026
916f239
add ENV DEBIAN_FRONTEND noninteractive
bedroge Oct 23, 2026
efe99e5
use DEBIAN_FRONTEND=noninteractive instead
bedroge Oct 23, 2026
9d1cb11
add libarchive-dev nlohmann-json3-dev deps
bedroge Oct 23, 2026
21bc590
add yum update
bedroge Oct 23, 2026
55093c3
add apt-get upgrade to Debian containers
bedroge Oct 23, 2026
9b91179
add yum update
bedroge Oct 23, 2026
6b9f847
add -y to apt-get upgrade
bedroge Oct 23, 2026
e769e7a
add apt-get upgrade -y
bedroge Oct 23, 2026
a33af50
transform el8_10 into el8
bedroge Oct 23, 2026
e44a4fd
transform el8_10 into el8
bedroge Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/build-publish-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
15 changes: 9 additions & 6 deletions containers/Dockerfile.EESSI-build-node-debian12
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
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
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 debian:12.11
FROM debian:12.15
ARG cvmfsversion
ARG awscliversion
ARG unionfsfuseversion

ENV DEBIAN_FRONTEND noninteractive

COPY --from=prepare-deb /root/deb /root/deb

RUN apt-get update
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
Expand Down
15 changes: 9 additions & 6 deletions containers/Dockerfile.EESSI-build-node-debian13
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
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
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 debian:trixie-20260713-slim
FROM debian:13.7-slim
ARG cvmfsversion
ARG awscliversion
ARG unionfsfuseversion

ENV DEBIAN_FRONTEND noninteractive

COPY --from=prepare-deb /root/deb /root/deb

RUN apt-get update
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
Expand Down
6 changes: 4 additions & 2 deletions containers/Dockerfile.EESSI-client-rocky8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand All @@ -24,8 +25,9 @@ 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)" \
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 \
Expand Down
1 change: 1 addition & 0 deletions containers/Dockerfile.EESSI-client-ubuntu22.04-macOS-26
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions containers/build-or-download-cvmfs-debs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cvmfsversion=$1
arch=$(dpkg --print-architecture)

apt-get update
apt-get update && apt-get upgrade -y
apt-get install -y wget lsb-release

distro=$(lsb_release -si | tr [:upper:] [:lower:])
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion containers/build-or-download-cvmfs-rpms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ cvmfsversion=$1
arch=$(uname -m)

yum install -y wget
elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2)"
yum update -y
elversion="$(rpm -q --queryformat '%{RELEASE}' rpm | cut -d '.' -f 2 | cut -d '_' -f 1)"
if [ "$arch" = "riscv64" ]
then
yum install -y epel-release
Expand Down
Loading