Skip to content

Commit

Permalink
Merge pull request #97 from bedroge/cvmfs_version_bump
Browse files Browse the repository at this point in the history
Bump CVMFS version in containers, increase time limit of workflow
  • Loading branch information
boegel authored Sep 28, 2021
2 parents cb3c1c6 + d225fcc commit 7f53726
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-publish-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
build_and_publish:
name: Build and publish image
runs-on: self-hosted
timeout-minutes: 720
permissions:
packages: write
contents: read
Expand Down
4 changes: 2 additions & 2 deletions containers/Dockerfile.EESSI-build-node-debian10
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions containers/Dockerfile.EESSI-client-pilot-centos7
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down

0 comments on commit 7f53726

Please sign in to comment.