Skip to content

Commit 7f53726

Browse files
authored
Merge pull request #97 from bedroge/cvmfs_version_bump
Bump CVMFS version in containers, increase time limit of workflow
2 parents cb3c1c6 + d225fcc commit 7f53726

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/build-publish-containers.yml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
build_and_publish:
2424
name: Build and publish image
2525
runs-on: self-hosted
26+
timeout-minutes: 720
2627
permissions:
2728
packages: write
2829
contents: read

containers/Dockerfile.EESSI-build-node-debian10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG cvmfsversion=2.8.1
1+
ARG cvmfsversion=2.8.2
22
ARG awscliversion=1.20.39
33

44
FROM debian:10.6 AS prepare-deb
@@ -14,7 +14,7 @@ ARG awscliversion
1414
COPY --from=prepare-deb /root/deb /root/deb
1515

1616
RUN apt-get update
17-
RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev
17+
RUN apt-get install -y sudo vim openssh-client gawk autofs curl attr uuid fuse3 libfuse2 psmisc gdb uuid-dev lsof
1818
# python3 and jq are required for eessi-upload-to-staging script (next to awscli)
1919
RUN apt-get install -y python3-pip jq
2020
RUN dpkg -i /root/deb/cvmfs_${cvmfsversion}~1+debian10_$(dpkg --print-architecture).deb \

containers/Dockerfile.EESSI-client-pilot-centos7

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG cvmfsversion=2.8.1
1+
ARG cvmfsversion=2.8.2
22
# Stick to old version of fuse-overlayfs due to issues with newer versions
33
# (cfr. https://github.com/containers/fuse-overlayfs/issues/232)
44
ARG fuseoverlayfsversion=0.3
@@ -24,7 +24,7 @@ ARG cvmfsversion
2424
COPY --from=prepare-rpm /root/rpmbuild/RPMS /root/rpmbuild/RPMS
2525
COPY --from=build-fuse-overlayfs /usr/local/bin/fuse-overlayfs /usr/local/bin/fuse-overlayfs
2626

27-
RUN yum install -y sudo vim openssh-clients
27+
RUN yum install -y sudo vim openssh-clients lsof
2828
RUN yum install -y /root/rpmbuild/RPMS/$(uname -m)/cvmfs-${cvmfsversion}-1.el7.$(uname -m).rpm \
2929
/root/rpmbuild/RPMS/$(uname -m)/cvmfs-fuse3-${cvmfsversion}-1.el7.$(uname -m).rpm \
3030
http://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm

0 commit comments

Comments
 (0)