From 01e324a92849bc75dea7530717036524bcb20fb3 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sylvester.joosten@gmail.com>
Date: Fri, 21 May 2021 03:10:03 -0400
Subject: [PATCH] Reduce CVMFS singularity priority
---
.gitignore | 2 ++
install.sh | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4ab0868aa..1cb1974b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ build
BUILD
debug
DEBUG
+
+.nfs*
diff --git a/install.sh b/install.sh
index eae3dc692..66ea66ca7 100755
--- a/install.sh
+++ b/install.sh
@@ -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
--
GitLab