From ea003dffed1ca72c3ee178eee7b1535e90f3f2f7 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 8 Jul 2024 14:15:08 +0200 Subject: [PATCH] Remove CentOS 7 --- .github/workflows/image-creator.yml | 2 +- Docker/centos7/build.sh | 2 -- Docker/centos7/centos7-build/Dockerfile | 6 ------ Docker/centos7/centos7-cvmfs/Dockerfile | 14 -------------- Docker/centos7/centos7-cvmfs/mount.sh | 9 --------- Docker/centos7/push.sh | 5 ----- README.md | 2 +- 7 files changed, 2 insertions(+), 38 deletions(-) delete mode 100755 Docker/centos7/build.sh delete mode 100644 Docker/centos7/centos7-build/Dockerfile delete mode 100644 Docker/centos7/centos7-cvmfs/Dockerfile delete mode 100755 Docker/centos7/centos7-cvmfs/mount.sh delete mode 100755 Docker/centos7/push.sh diff --git a/.github/workflows/image-creator.yml b/.github/workflows/image-creator.yml index 0992856..4008dca 100644 --- a/.github/workflows/image-creator.yml +++ b/.github/workflows/image-creator.yml @@ -15,7 +15,7 @@ jobs: build: strategy: matrix: - image: ["centos7", "alma9", "ubuntu22"] + image: ["alma9", "ubuntu22"] fail-fast: false runs-on: ubuntu-latest steps: diff --git a/Docker/centos7/build.sh b/Docker/centos7/build.sh deleted file mode 100755 index 6a36cfb..0000000 --- a/Docker/centos7/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker build -t centos7 centos7-build -docker build -t centos7-cvmfs centos7-cvmfs diff --git a/Docker/centos7/centos7-build/Dockerfile b/Docker/centos7/centos7-build/Dockerfile deleted file mode 100644 index 900b204..0000000 --- a/Docker/centos7/centos7-build/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM gitlab-registry.cern.ch/linuxsupport/cc7-base - -RUN yum update -y && yum groupinstall -y "Development Tools" && yum install -y epel-release python3 which wget vim python3-pip mesa-libGL mesa-libGL-devel mesa-libGLU mesa-libGLU-devel krb5-devel ccache -RUN pip3 install boto3 requests - -CMD ["/bin/bash"] \ No newline at end of file diff --git a/Docker/centos7/centos7-cvmfs/Dockerfile b/Docker/centos7/centos7-cvmfs/Dockerfile deleted file mode 100644 index becf996..0000000 --- a/Docker/centos7/centos7-cvmfs/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -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 - -CMD ["/bin/bash", "-c", "/mount.sh && /bin/bash"] diff --git a/Docker/centos7/centos7-cvmfs/mount.sh b/Docker/centos7/centos7-cvmfs/mount.sh deleted file mode 100755 index 7b7c58d..0000000 --- a/Docker/centos7/centos7-cvmfs/mount.sh +++ /dev/null @@ -1,9 +0,0 @@ -if mount | grep -q cvmfs; then - echo "CVMFS already mounted" - echo "/mount.sh does not need to be run anymore" - exit 0 -fi -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 diff --git a/Docker/centos7/push.sh b/Docker/centos7/push.sh deleted file mode 100755 index 66e5d2a..0000000 --- a/Docker/centos7/push.sh +++ /dev/null @@ -1,5 +0,0 @@ -docker build -t gitlab-registry.cern.ch/key4hep/k4-deploy/centos7 centos7-build -docker build -t gitlab-registry.cern.ch/key4hep/k4-deploy/centos7-cvmfs centos7-cvmfs -docker push gitlab-registry.cern.ch/key4hep/k4-deploy/centos7 -docker push gitlab-registry.cern.ch/key4hep/k4-deploy/centos7-cvmfs - diff --git a/README.md b/README.md index 145597c..6aebf95 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ docker build -t gitlab-registry.cern.ch/key4hep/k4-deploy/ . docker push gitlab-registry.cern.ch/key4hep/k4-deploy/ ``` -where `` can be `centos7-build`, `ubuntu-build` or `alma9-build`. +where `` can be `alma9-build` or `ubuntu-build`. # How to build and push to Github