Update images

key4hep · May 24, 2024 · cae0423 · cae0423
1 parent 4f8b050
commit cae0423
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@ RUN apt update && \

		COPY mount.sh /mount.sh

		CMD ["/bin/bash"]
		CMD ["/bin/bash", "-c", "/mount.sh && /bin/bash"]