Skip to content

Commit

Permalink
Add new builds with cvmfs
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell committed Dec 14, 2023
1 parent 2e6b327 commit e27cf12
Show file tree
Hide file tree
Showing 12 changed files with 64 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/image-creator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ name: Create images

on:
push:
schedule:
# every Sunday
- cron: '0 0 * * 0'
workflow_dispatch:

jobs:
Expand All @@ -26,10 +23,11 @@ jobs:
run: |
echo $PWD
ls -l
docker build -t ${{ matrix.image }} Docker/${{ matrix.image }}-build
Docker/${{ matrix.image }}/build.sh
- name: tag
run: |
docker tag ${{ matrix.image }} ghcr.io/key4hep/key4hep-images/${{ matrix.image }}:latest
docker tag ${{ matrix.image }}-cvmfs ghcr.io/key4hep/key4hep-images/${{ matrix.image }}-cvmfs:latest
- name: show
run: docker images
- name: login and push
Expand All @@ -39,6 +37,7 @@ jobs:
if [ ! -z ${deploy_secret} ]; then
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
docker push ghcr.io/key4hep/key4hep-images/${{ matrix.image }}:latest;
docker push ghcr.io/key4hep/key4hep-images/${{ matrix.image }}-cvmfs:latest;
else
echo "Skipping deploy no secrets present";
fi
File renamed without changes.
14 changes: 14 additions & 0 deletions Docker/alma9/alma9-cvmfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM alma9

RUN dnf install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm && \
dnf install -y cvmfs && \
mkdir /cvmfs/cvmfs-config.cern.ch /cvmfs/sw.hsf.org /cvmfs/sw-nightlies.hsf.org && \
echo "CVMFS_CONFIG_REPOSITORY=cvmfs-config.cern.ch" > /etc/cvmfs/default.local && \
echo "CVMFS_CLIENT_PROFILE=single" >> /etc/cvmfs/default.local && \
echo "CVMFS_QUOTA_LIMIT='15000'" >> /etc/cvmfs/default.local && \
echo "CVMFS_USE_CDN='yes'" >> /etc/cvmfs/default.local && \
dnf clean all

COPY mount.sh /mount.sh

ENTRYPOINT ["/bin/bash"]
4 changes: 4 additions & 0 deletions Docker/alma9/alma9-cvmfs/mount.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set -e
mount -t cvmfs cvmfs-config.cern.ch /cvmfs/cvmfs-config.cern.ch
mount -t cvmfs sw.hsf.org /cvmfs/sw.hsf.org
mount -t cvmfs sw-nightlies.hsf.org /cvmfs/sw-nightlies.hsf.org
2 changes: 2 additions & 0 deletions Docker/alma9/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docker build -t alma9 alma9-build
docker build -t alma9-cvmfs alma9-cvmfs
2 changes: 2 additions & 0 deletions Docker/centos7/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docker build -t centos7 centos7-build
docker build -t centos7-cvmfs centos7-cvmfs
File renamed without changes.
14 changes: 14 additions & 0 deletions Docker/centos7/centos7-cvmfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM centos7

RUN yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm && \
yum install -y cvmfs && \
mkdir /cvmfs/cvmfs-config.cern.ch /cvmfs/sw.hsf.org /cvmfs/sw-nightlies.hsf.org && \
echo "CVMFS_CONFIG_REPOSITORY=cvmfs-config.cern.ch" > /etc/cvmfs/default.local && \
echo "CVMFS_CLIENT_PROFILE=single" >> /etc/cvmfs/default.local && \
echo "CVMFS_QUOTA_LIMIT='15000'" >> /etc/cvmfs/default.local && \
echo "CVMFS_USE_CDN='yes'" >> /etc/cvmfs/default.local && \
yum clean all

COPY mount.sh /mount.sh

ENTRYPOINT ["/bin/bash"]
2 changes: 2 additions & 0 deletions Docker/ubuntu22/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docker build -t ubuntu22 ubuntu22-build
docker build -t ubuntu22-cvmfs ubuntu22-cvmfs
File renamed without changes.
19 changes: 19 additions & 0 deletions Docker/ubuntu22/ubuntu22-cvmfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM ubuntu22

RUN apt update && \
apt install -y lsb-release && \
wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb && \
dpkg -i cvmfs-release-latest_all.deb && \
rm -rf cvmfs-release-latest_all.deb && \
apt update && \
apt install -y cvmfs && \
mkdir /cvmfs/cvmfs-config.cern.ch /cvmfs/sw.hsf.org /cvmfs/sw-nightlies.hsf.org && \
echo "CVMFS_CLIENT_PROFILE=single" >> /etc/cvmfs/default.local && \
echo "CVMFS_QUOTA_LIMIT='15000'" >> /etc/cvmfs/default.local && \
echo "CVMFS_USE_CDN='yes'" >> /etc/cvmfs/default.local && \
apt clean &&\
rm -rf /var/lib/apt/lists/*

COPY mount.sh /mount.sh

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions Docker/ubuntu22/ubuntu22-cvmfs/mount.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set -e
mount -t cvmfs cvmfs-config.cern.ch /cvmfs/cvmfs-config.cern.ch
mount -t cvmfs sw.hsf.org /cvmfs/sw.hsf.org
mount -t cvmfs sw-nightlies.hsf.org /cvmfs/sw-nightlies.hsf.org

0 comments on commit e27cf12

Please sign in to comment.