We are always a container pilot, don't let that be overridden

(SOFTWARE-5363)
opensciencegrid · Jan 27, 2023 · cf076af · cf076af
1 parent 82a148a
commit cf076af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/10-setup-htcondor.sh b/10-setup-htcondor.sh
@@ -519,6 +519,7 @@ else
 fi
 rm -f /tmp/stashcp-debug.txt
 
+export IS_CONTAINER_PILOT=1
 if [[ -e ${osgvo_additional_htcondor_config} ]]; then
     echo >&2 "${osgvo_additional_htcondor_config} found; running it"
     bash -x ${osgvo_additional_htcondor_config} $glidein_config

diff --git a/Dockerfile b/Dockerfile
@@ -14,8 +14,6 @@ RUN apk --no-cache add gcc musl-dev && \
 
 FROM opensciencegrid/software-base:${BASE_OSG_SERIES}-${BASE_OS}-${BASE_YUM_REPO}
 
-ENV IS_CONTAINER_PILOT=1
-
 # Set this to "1" to use ITB versions of scripts and connect to the ITB pool
 ENV ITB=