From fea7674fd1bde750c3b17ff98ff301fc39718a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 21 Jul 2022 13:15:43 +0200 Subject: [PATCH 01/10] bump cvmfs version to 2.9.4 --- containers/Dockerfile.EESSI-build-node-debian10 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian10 b/containers/Dockerfile.EESSI-build-node-debian10 index a57a591a..fb7652da 100644 --- a/containers/Dockerfile.EESSI-build-node-debian10 +++ b/containers/Dockerfile.EESSI-build-node-debian10 @@ -1,4 +1,4 @@ -ARG cvmfsversion=2.9.0 +ARG cvmfsversion=2.9.4 ARG awscliversion=1.22.33 FROM debian:10.11 AS prepare-deb From 5429008dc0ffefe90aae823f5809f1174985acc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 21 Jul 2022 13:16:06 +0200 Subject: [PATCH 02/10] bump cvmfs version to 2.9.4 --- containers/Dockerfile.EESSI-client-pilot-centos7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/Dockerfile.EESSI-client-pilot-centos7 b/containers/Dockerfile.EESSI-client-pilot-centos7 index a5a0636e..8ab3aa99 100644 --- a/containers/Dockerfile.EESSI-client-pilot-centos7 +++ b/containers/Dockerfile.EESSI-client-pilot-centos7 @@ -1,4 +1,4 @@ -ARG cvmfsversion=2.9.0 +ARG cvmfsversion=2.9.4 # Stick to old version of fuse-overlayfs due to issues with newer versions # (cfr. https://github.com/containers/fuse-overlayfs/issues/232) ARG fuseoverlayfsversion=0.3 From 99737262e672926a13a4c9ec48c779bf166e36c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 21 Jul 2022 13:17:28 +0200 Subject: [PATCH 03/10] enable CVMFS_HIDE_MAGIC_XATTRS in containers --- containers/Dockerfile.EESSI-build-node-debian10 | 3 ++- containers/Dockerfile.EESSI-client-pilot-centos7 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian10 b/containers/Dockerfile.EESSI-build-node-debian10 index fb7652da..1a4567ef 100644 --- a/containers/Dockerfile.EESSI-build-node-debian10 +++ b/containers/Dockerfile.EESSI-build-node-debian10 @@ -30,7 +30,8 @@ RUN dpkg -i /root/deb/cvmfs_${cvmfsversion}~1+debian10_$(dpkg --print-architectu RUN apt-get install -y fuse-overlayfs RUN echo 'CVMFS_QUOTA_LIMIT=10000' > /etc/cvmfs/default.local \ - && echo 'CVMFS_CLIENT_PROFILE="single"' >> /etc/cvmfs/default.local + && echo 'CVMFS_CLIENT_PROFILE="single"' >> /etc/cvmfs/default.local \ + && echo 'CVMFS_HIDE_MAGIC_XATTRS=yes' >> /etc/cvmfs/default.local RUN mkdir -p /cvmfs/pilot.eessi-hpc.org diff --git a/containers/Dockerfile.EESSI-client-pilot-centos7 b/containers/Dockerfile.EESSI-client-pilot-centos7 index 8ab3aa99..9694a696 100644 --- a/containers/Dockerfile.EESSI-client-pilot-centos7 +++ b/containers/Dockerfile.EESSI-client-pilot-centos7 @@ -35,7 +35,8 @@ RUN curl -L -o /usr/local/bin/fuse-overlayfs https://github.com/containers/fuse- && chmod +x /usr/local/bin/fuse-overlayfs RUN echo 'CVMFS_QUOTA_LIMIT=10000' > /etc/cvmfs/default.local \ - && echo 'CVMFS_CLIENT_PROFILE="single"' >> /etc/cvmfs/default.local + && echo 'CVMFS_CLIENT_PROFILE="single"' >> /etc/cvmfs/default.local \ + && echo 'CVMFS_HIDE_MAGIC_XATTRS=yes' >> /etc/cvmfs/default.local RUN mkdir -p /cvmfs/pilot.eessi-hpc.org From e3854c807731ed0193918eab90e9907d5e07a41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 22 Jul 2022 09:56:17 +0200 Subject: [PATCH 04/10] only install python3 --- 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 3ac10dfb..5402f66a 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -5,7 +5,7 @@ apt-get update apt-get install -y wget if [ "$arch" = "ppc64el" ] || [ "$arch" = "arm64" ] then - apt-get install -y devscripts libfuse3-dev cmake cpio libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python-dev python-setuptools python3-setuptools uuid-dev valgrind libz-dev lsb-release + apt-get install -y devscripts libfuse3-dev cmake cpio libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools uuid-dev valgrind 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 7c7668c694b4f31d3b5be1d10803c4723d0da0d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 22 Jul 2022 10:10:36 +0200 Subject: [PATCH 05/10] only install python3 --- 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 fe256427..54ee578f 100644 --- a/containers/build-or-download-cvmfs-rpms.sh +++ b/containers/build-or-download-cvmfs-rpms.sh @@ -5,7 +5,7 @@ yum install -y wget if [ "$arch" = "ppc64le" ] then yum install -y epel-release - yum install -y rpm-build checkpolicy cmake fuse-devel fuse3-devel gcc gcc-c++ golang libattr-devel libcap-devel libuuid-devel openssl-devel python2-devel python2-setuptools selinux-policy-devel valgrind-devel hardlink selinux-policy-targeted + yum install -y rpm-build checkpolicy cmake fuse-devel fuse3-devel gcc gcc-c++ golang libattr-devel libcap-devel libuuid-devel openssl-devel python3-devel python3-setuptools selinux-policy-devel valgrind-devel hardlink selinux-policy-targeted wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-${cvmfsversion}-1.el7.src.rpm && rpmbuild --rebuild cvmfs-${cvmfsversion}-1.el7.src.rpm else mkdir -p /root/rpmbuild/RPMS/${arch} From b72e8dcd64e77b43e563eaed925c7ab34e9457d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 22 Jul 2022 10:40:59 +0200 Subject: [PATCH 06/10] install python2 but set python3 as default --- containers/build-or-download-cvmfs-debs.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index 5402f66a..49214bed 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -5,7 +5,10 @@ apt-get update apt-get install -y wget if [ "$arch" = "ppc64el" ] || [ "$arch" = "arm64" ] then - apt-get install -y devscripts libfuse3-dev cmake cpio libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python3-dev python3-setuptools uuid-dev valgrind libz-dev lsb-release + apt-get install -y devscripts libfuse3-dev cmake cpio libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python-dev python-setuptools python3-dev python3-setuptools uuid-dev valgrind libz-dev lsb-release + # Set Python 3 as default Python + update-alternatives --install /usr/bin/python python /usr/bin/python2 1 + update-alternatives --install /usr/bin/python python /usr/bin/python3 2 cd /tmp wget https://github.com/cvmfs/cvmfs/archive/refs/tags/cvmfs-${cvmfsversion}.tar.gz tar xzf cvmfs-${cvmfsversion}.tar.gz From 508d1771bf7bd53365f200c6f08dd1bdb8982d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 22 Jul 2022 10:44:22 +0200 Subject: [PATCH 07/10] install python2 but set python3 as default --- containers/build-or-download-cvmfs-rpms.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/containers/build-or-download-cvmfs-rpms.sh b/containers/build-or-download-cvmfs-rpms.sh index 54ee578f..c19a1994 100644 --- a/containers/build-or-download-cvmfs-rpms.sh +++ b/containers/build-or-download-cvmfs-rpms.sh @@ -5,7 +5,10 @@ yum install -y wget if [ "$arch" = "ppc64le" ] then yum install -y epel-release - yum install -y rpm-build checkpolicy cmake fuse-devel fuse3-devel gcc gcc-c++ golang libattr-devel libcap-devel libuuid-devel openssl-devel python3-devel python3-setuptools selinux-policy-devel valgrind-devel hardlink selinux-policy-targeted + yum install -y rpm-build checkpolicy cmake fuse-devel fuse3-devel gcc gcc-c++ golang libattr-devel libcap-devel libuuid-devel openssl-devel python-devel python-setuptools python3-devel python3-setuptools selinux-policy-devel valgrind-devel hardlink selinux-policy-targeted + # Set Python 3 as default Python + update-alternatives --install /usr/bin/python python /usr/bin/python2 1 + update-alternatives --install /usr/bin/python python /usr/bin/python3 2 wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-${cvmfsversion}-1.el7.src.rpm && rpmbuild --rebuild cvmfs-${cvmfsversion}-1.el7.src.rpm else mkdir -p /root/rpmbuild/RPMS/${arch} From c4f882d84455a7c5bbffeff44fd1ffb70e65571e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 10 Aug 2022 14:35:02 +0200 Subject: [PATCH 08/10] use python2 as default --- containers/build-or-download-cvmfs-rpms.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/containers/build-or-download-cvmfs-rpms.sh b/containers/build-or-download-cvmfs-rpms.sh index c19a1994..4c75106c 100644 --- a/containers/build-or-download-cvmfs-rpms.sh +++ b/containers/build-or-download-cvmfs-rpms.sh @@ -7,8 +7,9 @@ then yum install -y epel-release yum install -y rpm-build checkpolicy cmake fuse-devel fuse3-devel gcc gcc-c++ golang libattr-devel libcap-devel libuuid-devel openssl-devel python-devel python-setuptools python3-devel python3-setuptools selinux-policy-devel valgrind-devel hardlink selinux-policy-targeted # Set Python 3 as default Python - update-alternatives --install /usr/bin/python python /usr/bin/python2 1 - update-alternatives --install /usr/bin/python python /usr/bin/python3 2 + update-alternatives --install /usr/bin/python python /usr/bin/python3 1 + update-alternatives --install /usr/bin/python python /usr/bin/python2 2 + update-alternatives --set python /usr/bin/python2 wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-${cvmfsversion}/cvmfs-${cvmfsversion}-1.el7.src.rpm && rpmbuild --rebuild cvmfs-${cvmfsversion}-1.el7.src.rpm else mkdir -p /root/rpmbuild/RPMS/${arch} From 8298a572d0d1377aa25ea5599b6463441bd7853b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 11 Aug 2022 09:07:54 +0200 Subject: [PATCH 09/10] use prebuilt fuse-overlayfs instead of downloading a binary --- containers/Dockerfile.EESSI-client-pilot-centos7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/Dockerfile.EESSI-client-pilot-centos7 b/containers/Dockerfile.EESSI-client-pilot-centos7 index 9694a696..f4904819 100644 --- a/containers/Dockerfile.EESSI-client-pilot-centos7 +++ b/containers/Dockerfile.EESSI-client-pilot-centos7 @@ -31,8 +31,8 @@ RUN yum install -y /root/rpmbuild/RPMS/$(uname -m)/cvmfs-${cvmfsversion}-1.el7.$ RUN yum install -y https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi-latest.noarch.rpm # download binary for specific version of fuse-overlayfs -RUN curl -L -o /usr/local/bin/fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/v${fuseoverlayfsversion}/fuse-overlayfs-$(uname -m) \ - && chmod +x /usr/local/bin/fuse-overlayfs +#RUN curl -L -o /usr/local/bin/fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/v${fuseoverlayfsversion}/fuse-overlayfs-$(uname -m) \ +# && chmod +x /usr/local/bin/fuse-overlayfs RUN echo 'CVMFS_QUOTA_LIMIT=10000' > /etc/cvmfs/default.local \ && echo 'CVMFS_CLIENT_PROFILE="single"' >> /etc/cvmfs/default.local \ From db192314698c3db9c34bfa87762eea23805bce97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 1 Sep 2022 09:16:42 +0200 Subject: [PATCH 10/10] fix comment about default python version --- containers/build-or-download-cvmfs-debs.sh | 2 +- containers/build-or-download-cvmfs-rpms.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/build-or-download-cvmfs-debs.sh b/containers/build-or-download-cvmfs-debs.sh index 49214bed..9f361698 100644 --- a/containers/build-or-download-cvmfs-debs.sh +++ b/containers/build-or-download-cvmfs-debs.sh @@ -6,7 +6,7 @@ apt-get install -y wget if [ "$arch" = "ppc64el" ] || [ "$arch" = "arm64" ] then apt-get install -y devscripts libfuse3-dev cmake cpio libcap-dev libssl-dev libfuse-dev pkg-config libattr1-dev python-dev python-setuptools python3-dev python3-setuptools uuid-dev valgrind libz-dev lsb-release - # Set Python 3 as default Python + # Set Python 2 as default Python update-alternatives --install /usr/bin/python python /usr/bin/python2 1 update-alternatives --install /usr/bin/python python /usr/bin/python3 2 cd /tmp diff --git a/containers/build-or-download-cvmfs-rpms.sh b/containers/build-or-download-cvmfs-rpms.sh index 4c75106c..078c4f71 100644 --- a/containers/build-or-download-cvmfs-rpms.sh +++ b/containers/build-or-download-cvmfs-rpms.sh @@ -6,7 +6,7 @@ if [ "$arch" = "ppc64le" ] then yum install -y epel-release yum install -y rpm-build checkpolicy cmake fuse-devel fuse3-devel gcc gcc-c++ golang libattr-devel libcap-devel libuuid-devel openssl-devel python-devel python-setuptools python3-devel python3-setuptools selinux-policy-devel valgrind-devel hardlink selinux-policy-targeted - # Set Python 3 as default Python + # Set Python 2 as default Python update-alternatives --install /usr/bin/python python /usr/bin/python3 1 update-alternatives --install /usr/bin/python python /usr/bin/python2 2 update-alternatives --set python /usr/bin/python2