diff --git a/bin/image-exec b/bin/image-exec index 916112d05dad81b23d4ea864be1fd7f88277a544..185638ac6e4b84de1552eeff85f8db6930149f09 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 2c937e8eb714785508aedc3a8362c89921835a3f..2de69b85c462cdc6d522bfe8ae5a6751b155194f 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 b5d7fbc220ccab0eee849c1459db9136d738076c..9b01b152e8da339229a0f689a5529b7bb160c58f 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 fae0f68f4921663ee34344abfcd011a9f39395f2..aef7595cebc600cc57f99093e99639634c2d43d8 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 2979c7f1635d1e91e0e6d0a5a7122e6fc8308908..88ca172ed055172117fcc4da04713755c300f95e 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 fdf099ccfd253800412b89d3d3a1fe0c3f3c47da..cca103cc1eed50b634b4fc7eabef62cf031301ac 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 3fe5c84aaac1bbe56bffb1d1ac3fba4802020e1a..fc1125a6a7f7d95ec21a05a552478ee1d82cc0a7 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 82826b9e9a1e4725f17c5d081354411fb42e6deb..f0c9c1a168bbcfa1e216f79b771ec092f20bf576 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