Skip to content

Upgrade CernVM-FS to 2.13.0 in containers #216

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
merged 11 commits into from
Jun 2, 2025
Merged

Upgrade CernVM-FS to 2.13.0 in containers #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37f204f
Upgrade CernVM-FS to 2.13.0 in containers
ocaisa May 21, 2025
ab88711
bump actions/checkout to 4.2.2
bedroge May 23, 2025
5a13a62
bump actions/cache to 4.2.3
bedroge May 23, 2025
0a86c2e
control.in was renamed to control, so just use control*
bedroge May 23, 2025
4fbb1ff
debian13 has libfuse3-4 instead of libfuse3-3
bedroge May 23, 2025
32ec5c1
only use libfuse3-4 for debian13
bedroge May 23, 2025
e4694ec
no need to build from source for arm, debian11+13 packages are provided
bedroge May 23, 2025
7f21a57
add missing / to sed command
bedroge May 23, 2025
895eb96
Only build from source for risc64
bedroge May 24, 2025
97e8e67
do build from source for debian13 due to libfuse3-3 issue
bedroge May 24, 2025
fb2b639
install golang
bedroge May 24, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/build-publish-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up QEMU
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
Expand All @@ -52,7 +52,7 @@ jobs:
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1

- name: Cache Docker layers
uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ matrix.platform }}-${{ matrix.tag }}
Expand Down
2 changes: 1 addition & 1 deletion containers/Dockerfile.EESSI-build-node-debian-sid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG cvmfsversion=2.11.5
ARG cvmfsversion=2.13.0
ARG archspecversion=0.2.2
ARG awscliversion=1.32.22
ARG fuseoverlayfsversion=1.10
Expand Down
2 changes: 1 addition & 1 deletion containers/Dockerfile.EESSI-build-node-debian11
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG cvmfsversion=2.11.5
ARG cvmfsversion=2.13.0
ARG awscliversion=1.32.22
ARG fuseoverlayfsversion=1.10

Expand Down
2 changes: 1 addition & 1 deletion 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.11.5
ARG cvmfsversion=2.13.0
# 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 Down
14 changes: 8 additions & 6 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 @@ -16,21 +16,23 @@ fi

os="${distro}${release}"

if [ "$arch" = "arm64" ] || [ "$arch" = "riscv64" ] || [ "${os}" = "debian13" ]
if [ "$arch" = "riscv64" ] || [ "${os}" = "debian13" ]
then
apt-get install -y devscripts libfuse3-dev cmake cpio 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 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
cd cvmfs-cvmfs-${cvmfsversion}
mkdir /root/deb
sed -i 's/Architecture: i386 amd64 armhf arm64/Architecture: i386 amd64 armhf arm64 riscv64/' packaging/debian/cvmfs/control.in
sed -i 's/python-dev/python3-dev/' packaging/debian/cvmfs/control.in
sed -i 's/python-setuptools/python3-setuptools/' packaging/debian/cvmfs/control.in
sed -i 's/amd64 armhf arm64/amd64 armhf arm64 riscv64/' packaging/debian/cvmfs/control*
sed -i 's/python-dev/python3-dev/' packaging/debian/cvmfs/control*
sed -i 's/python-setuptools/python3-setuptools/' packaging/debian/cvmfs/control*
# debian13 has libfuse3-4
[ $os = "debian13" ] && sed -i 's/libfuse3-3/libfuse3-4/' packaging/debian/cvmfs/control*
if [ "$arch" = "riscv64" ]
then
# valgrind is not available (yet) for RISC-V
sed -i 's/, valgrind//' packaging/debian/cvmfs/control.in
sed -i 's/, valgrind//' packaging/debian/cvmfs/control*
# for RISC-V we need to run autoreconf, see:
# https://github.com/cvmfs/cvmfs/pull/3446
wget https://github.com/cvmfs/cvmfs/pull/3446.patch
Expand Down
Loading