From 4a047b1396b4c2d02530e9da24d0c45e9f9bd039 Mon Sep 17 00:00:00 2001
From: Josef Hrabal <josef.hrabal@vsb.cz>
Date: Fri, 11 Oct 2019 09:48:42 +0200
Subject: [PATCH] modified: bin/image-exec modified:
bin/image-load modified: bin/image-mpi modified:
bin/image-run modified: bin/image-shell modified: bin/image-update
modified: install/CENTOS7 modified: install/CONFIG
---
bin/image-exec | 2 +-
bin/image-load | 4 ++--
bin/image-mpi | 2 +-
bin/image-run | 2 +-
bin/image-shell | 2 +-
bin/image-update | 1 -
install/CENTOS7 | 2 +-
install/CONFIG | 4 ++--
8 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/bin/image-exec b/bin/image-exec
index 916112d..185638a 100755
--- a/bin/image-exec
+++ b/bin/image-exec
@@ -10,4 +10,4 @@ if [ -z "$1" ]; then
exit 1
fi
-singularity exec --bind /scratch --bind /apps --writable $IMAGE_PATH_LOCAL "$@"
+singularity exec --bind /scratch --bind /apps $IMAGE_PATH_LOCAL "$@"
diff --git a/bin/image-load b/bin/image-load
index 2c937e8..2de69b8 100755
--- a/bin/image-load
+++ b/bin/image-load
@@ -5,7 +5,7 @@ if [ -z "IMAGE_ROOT" ] || [ -z "IMAGE_OS" ] || [ -z "IMAGE_VERSION" ]; then
exit 1
fi
-VERSION=$(ls -t $IMAGE_ROOT | grep .img | head -1)
+VERSION=$(ls -t $IMAGE_ROOT | grep .simg | head -1)
if [ ! -d "$HOME/.singularity/images" ]; then
mkdir -p $HOME/.singularity/images
@@ -39,7 +39,7 @@ fi
if [ "$1" == "shell" ]; then
export IMAGE_PATH_LOCAL="$HOME/.singularity/images/$LOCAL"
- singularity shell --bind /scratch --bind /apps --writable $HOME/.singularity/images/$LOCAL
+ singularity shell --bind /scratch --bind /apps $HOME/.singularity/images/$LOCAL
SYS=`/bin/cat /etc/centos-release`
echo -e "\e[33mWelcome to the normal operating system ($SYS)\e[0m"
else
diff --git a/bin/image-mpi b/bin/image-mpi
index b5d7fbc..9b01b15 100755
--- a/bin/image-mpi
+++ b/bin/image-mpi
@@ -50,4 +50,4 @@ PARAM=$(echo "$PARAM" | sed -e 's/ */ /g' -e 's/^ *\(.*\) *$/\1/')
#echo "mpirun $PARAM singularity exec --bind /scratch --bind /apps --writable $IMAGE_PATH_LOCAL $EXEC"
-mpirun ${PARAM} singularity exec --bind /scratch --bind /apps --writable "$IMAGE_PATH_LOCAL" "$EXEC"
+mpirun ${PARAM} singularity exec --bind /scratch --bind /apps "$IMAGE_PATH_LOCAL" "$EXEC"
diff --git a/bin/image-run b/bin/image-run
index fae0f68..aef7595 100755
--- a/bin/image-run
+++ b/bin/image-run
@@ -5,4 +5,4 @@ if [ -z "IMAGE_PATH_LOCAL" ]; then
exit 1
fi
-singularity run --bind /scratch --bind /apps --writable $IMAGE_PATH_LOCAL "$@"
+singularity run --bind /scratch --bind /apps $IMAGE_PATH_LOCAL "$@"
diff --git a/bin/image-shell b/bin/image-shell
index 2979c7f..88ca172 100755
--- a/bin/image-shell
+++ b/bin/image-shell
@@ -5,4 +5,4 @@ if [ -z "IMAGE_PATH_LOCAL" ]; then
exit 1
fi
-singularity shell --bind /scratch --bind /apps --writable $IMAGE_PATH_LOCAL $@
+singularity shell --bind /scratch --bind /apps $IMAGE_PATH_LOCAL $@
diff --git a/bin/image-update b/bin/image-update
index fdf099c..cca103c 100755
--- a/bin/image-update
+++ b/bin/image-update
@@ -25,4 +25,3 @@ if [ "$LOCAL_VERSION" \< "$APPS_VERSION" ]; then
else
echo -e "\e[33mYou already have the newest version of\e[0m $IMAGE_OS \e[33mimage.\e[0m"
fi
-
diff --git a/install/CENTOS7 b/install/CENTOS7
index 3fe5c84..fc1125a 100644
--- a/install/CENTOS7
+++ b/install/CENTOS7
@@ -1,5 +1,5 @@
Bootstrap: docker
-From: centos:latest
+From: centos:7
%post
yum -y update && yum -y upgrade
diff --git a/install/CONFIG b/install/CONFIG
index 82826b9..f0c9c1a 100644
--- a/install/CONFIG
+++ b/install/CONFIG
@@ -2,9 +2,9 @@ GPU_DRIVER_VERSION=390.30
GPU_DRIVER_PATH=/apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run
MPSS_PATH=/opt/mpss
MIC_PATH=./rpm.tar.gz
-SINGULARITY_BIN_PATH=/apps/all/Singularity/3.1.0/bin
+SINGULARITY_BIN_PATH=/apps/all/Singularity/3.3.0/bin
IMAGE_PATH=/apps/all/OS
MODULEFILE_PATH=/apps/modules
USER_IMAGE=easybuild
EBROOTSQUASHFSMINTOOLS=/apps/all/squashfs-tools/4.3
-PATH=$PATH:/apps/all/Singularity/3.1.0/bin
+PATH=$PATH:/apps/all/Singularity/3.3.0/bin
--
GitLab