Skip to content
Snippets Groups Projects
Commit 1b653358 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Merge branch 'improve_install' into 'master'

Reduce CVMFS singularity priority

See merge request !58
parents 6594005b 01e324a9
No related branches found
No related tags found
1 merge request!58Reduce CVMFS singularity priority
......@@ -14,3 +14,5 @@ build
BUILD
debug
DEBUG
.nfs*
......@@ -26,14 +26,16 @@ if [ $(type -P singularity ) ]; then
fi
fi
if [ -z $SINGULARITY ]; then
## first priority: a known good install (this one is on JLAB)
if [ -d "/apps/singularity/3.7.1/bin/" ]; then
SINGULARITY="/apps/singularity/3.7.1/bin/singularity"
## cvmfs singularity
elif [ -f "/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity" ]; then
SINGULARITY="/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity"
## whatever is in the path
## whatever is in the path is next
elif [ $(type -P singularity ) ]; then
SINGULARITY=$(which singularity)
## cvmfs singularity is last resort (sandbox mode can cause issues)
elif [ -f "/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity" ]; then
SINGULARITY="/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity"
## not good...
else
echo "ERROR: no singularity found, please make sure you have singularity in your \$PATH"
exit 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment