From d863187a6b408c8df99e6cf440270c1ec1f4dea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 27 Sep 2021 09:19:32 +0200 Subject: [PATCH 1/3] bump cvmfs to 2.8.2 --- containers/Dockerfile.EESSI-build-node-debian10 | 2 +- containers/Dockerfile.EESSI-client-pilot-centos7 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian10 b/containers/Dockerfile.EESSI-build-node-debian10 index faa08020..c4fbcc44 100644 --- a/containers/Dockerfile.EESSI-build-node-debian10 +++ b/containers/Dockerfile.EESSI-build-node-debian10 @@ -1,4 +1,4 @@ -ARG cvmfsversion=2.8.1 +ARG cvmfsversion=2.8.2 ARG awscliversion=1.20.39 FROM debian:10.6 AS prepare-deb diff --git a/containers/Dockerfile.EESSI-client-pilot-centos7 b/containers/Dockerfile.EESSI-client-pilot-centos7 index e4154394..dec45083 100644 --- a/containers/Dockerfile.EESSI-client-pilot-centos7 +++ b/containers/Dockerfile.EESSI-client-pilot-centos7 @@ -1,4 +1,4 @@ -ARG cvmfsversion=2.8.1 +ARG cvmfsversion=2.8.2 # 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 9d948ff8b9eb861b23bee96f8875d57736c68a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 27 Sep 2021 09:20:19 +0200 Subject: [PATCH 2/3] increase time limit for container builds --- .github/workflows/build-publish-containers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-publish-containers.yml b/.github/workflows/build-publish-containers.yml index a26f5d82..964bcaf6 100644 --- a/.github/workflows/build-publish-containers.yml +++ b/.github/workflows/build-publish-containers.yml @@ -23,6 +23,7 @@ jobs: build_and_publish: name: Build and publish image runs-on: ubuntu-latest + timeout-minutes: 720 permissions: packages: write contents: read From d225fccf45bedddc2d947e6889ca90ef0aee9dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 27 Sep 2021 09:39:01 +0200 Subject: [PATCH 3/3] install lsof (dep of cvmfs) --- containers/Dockerfile.EESSI-build-node-debian10 | 2 +- containers/Dockerfile.EESSI-client-pilot-centos7 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/Dockerfile.EESSI-build-node-debian10 b/containers/Dockerfile.EESSI-build-node-debian10 index 6740d8c3..52e5999b 100644 --- a/containers/Dockerfile.EESSI-build-node-debian10 +++ b/containers/Dockerfile.EESSI-build-node-debian10 @@ -14,7 +14,7 @@ ARG awscliversion COPY --from=prepare-deb /root/deb /root/deb RUN apt-get update -RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev +RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev lsof # python3 and jq are required for eessi-upload-to-staging script (next to awscli) RUN apt-get install -y python3-pip jq RUN dpkg -i /root/deb/cvmfs_${cvmfsversion}~1+debian10_$(dpkg --print-architecture).deb \ diff --git a/containers/Dockerfile.EESSI-client-pilot-centos7 b/containers/Dockerfile.EESSI-client-pilot-centos7 index dec45083..40097d22 100644 --- a/containers/Dockerfile.EESSI-client-pilot-centos7 +++ b/containers/Dockerfile.EESSI-client-pilot-centos7 @@ -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 +RUN yum install -y sudo vim openssh-clients lsof RUN yum install -y /root/rpmbuild/RPMS/$(uname -m)/cvmfs-${cvmfsversion}-1.el7.$(uname -m).rpm \ /root/rpmbuild/RPMS/$(uname -m)/cvmfs-fuse3-${cvmfsversion}-1.el7.$(uname -m).rpm \ http://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm