From cae04238c5fd216a8428d008081a564abbd68d6b Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Fri, 24 May 2024 08:49:38 +0200 Subject: [PATCH] Update images --- Docker/alma9/alma9-cvmfs/Dockerfile | 2 +- Docker/alma9/alma9-cvmfs/mount.sh | 5 +++++ Docker/centos7/centos7-cvmfs/Dockerfile | 2 +- Docker/centos7/centos7-cvmfs/mount.sh | 5 +++++ Docker/ubuntu22/ubuntu22-cvmfs/Dockerfile | 2 +- Docker/ubuntu22/ubuntu22-cvmfs/mount.sh | 5 +++++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Docker/alma9/alma9-cvmfs/Dockerfile b/Docker/alma9/alma9-cvmfs/Dockerfile index ec1e179..408d6e1 100644 --- a/Docker/alma9/alma9-cvmfs/Dockerfile +++ b/Docker/alma9/alma9-cvmfs/Dockerfile @@ -11,4 +11,4 @@ RUN dnf install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release- COPY mount.sh /mount.sh -CMD ["/bin/bash"] +CMD ["/bin/bash", "-c", "/mount.sh && /bin/bash"] diff --git a/Docker/alma9/alma9-cvmfs/mount.sh b/Docker/alma9/alma9-cvmfs/mount.sh index 2ce1df5..7b7c58d 100755 --- a/Docker/alma9/alma9-cvmfs/mount.sh +++ b/Docker/alma9/alma9-cvmfs/mount.sh @@ -1,3 +1,8 @@ +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 diff --git a/Docker/centos7/centos7-cvmfs/Dockerfile b/Docker/centos7/centos7-cvmfs/Dockerfile index 6239cd3..becf996 100644 --- a/Docker/centos7/centos7-cvmfs/Dockerfile +++ b/Docker/centos7/centos7-cvmfs/Dockerfile @@ -11,4 +11,4 @@ RUN yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release- COPY mount.sh /mount.sh -CMD ["/bin/bash"] +CMD ["/bin/bash", "-c", "/mount.sh && /bin/bash"] diff --git a/Docker/centos7/centos7-cvmfs/mount.sh b/Docker/centos7/centos7-cvmfs/mount.sh index 2ce1df5..7b7c58d 100755 --- a/Docker/centos7/centos7-cvmfs/mount.sh +++ b/Docker/centos7/centos7-cvmfs/mount.sh @@ -1,3 +1,8 @@ +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 diff --git a/Docker/ubuntu22/ubuntu22-cvmfs/Dockerfile b/Docker/ubuntu22/ubuntu22-cvmfs/Dockerfile index 1cbd385..28cedec 100644 --- a/Docker/ubuntu22/ubuntu22-cvmfs/Dockerfile +++ b/Docker/ubuntu22/ubuntu22-cvmfs/Dockerfile @@ -16,4 +16,4 @@ RUN apt update && \ COPY mount.sh /mount.sh -CMD ["/bin/bash"] +CMD ["/bin/bash", "-c", "/mount.sh && /bin/bash"] diff --git a/Docker/ubuntu22/ubuntu22-cvmfs/mount.sh b/Docker/ubuntu22/ubuntu22-cvmfs/mount.sh index 2ce1df5..7b7c58d 100755 --- a/Docker/ubuntu22/ubuntu22-cvmfs/mount.sh +++ b/Docker/ubuntu22/ubuntu22-cvmfs/mount.sh @@ -1,3 +1,8 @@ +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