From b0f7c393e0a78df403d8a1354c0c59aab49bfc0d Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Thu, 16 Jan 2025 11:44:43 +0100 Subject: [PATCH 1/2] Add cvmfs_shrinkwrap to EESSI container to enable exporting EESSI environment --- containers/Dockerfile.EESSI-client-rocky8 | 1 + containers/build-or-download-cvmfs-debs.sh | 1 + containers/build-or-download-cvmfs-rpms.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/containers/Dockerfile.EESSI-client-rocky8 b/containers/Dockerfile.EESSI-client-rocky8 index 6e66e5e3..88ad2d4c 100644 --- a/containers/Dockerfile.EESSI-client-rocky8 +++ b/containers/Dockerfile.EESSI-client-rocky8 @@ -29,6 +29,7 @@ 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 \ /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 \ + /root/rpmbuild/RPMS/$(uname -m)/cvmfs-shrinkwrap-${cvmfsversion}-1.${elversion}.$(uname -m).rpm \ http://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm RUN yum install -y https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi-latest.noarch.rpm diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index 808ebbec..e06fe29d 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -73,6 +73,7 @@ else wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs_${cvmfsversion}~1+${os}_${arch}.deb wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-fuse3_${cvmfsversion}~1+${os}_${arch}.deb wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-libs_${cvmfsversion}~1+${os}_${arch}.deb + wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-shrinkwrap_${cvmfsversion}~1+${os}_${arch}.deb fi cd /root/deb diff --git a/containers/build-or-download-cvmfs-rpms.sh b/containers/build-or-download-cvmfs-rpms.sh index 5d4f5b09..d3a10ad6 100644 --- a/containers/build-or-download-cvmfs-rpms.sh +++ b/containers/build-or-download-cvmfs-rpms.sh @@ -18,4 +18,5 @@ else wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-${cvmfsversion}-1.${elversion}.${arch}.rpm wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-fuse3-${cvmfsversion}-1.${elversion}.${arch}.rpm wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-libs-${cvmfsversion}-1.${elversion}.${arch}.rpm + wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-shrinkwrap-${cvmfsversion}-1.${elversion}.${arch}.rpm fi From e1f147a087667ec0795c0b8665c20c90bfd2796b Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Fri, 17 Jan 2025 10:12:22 +0100 Subject: [PATCH 2/2] Add squashfs --- 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 88ad2d4c..531f9f56 100644 --- a/containers/Dockerfile.EESSI-client-rocky8 +++ b/containers/Dockerfile.EESSI-client-rocky8 @@ -24,7 +24,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 install -y sudo vim openssh-clients lsof strace +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 \ /root/rpmbuild/RPMS/$(uname -m)/cvmfs-fuse3-${cvmfsversion}-1.${elversion}.$(uname -m).rpm \