From cf076afe28b9d767da5d0152e24ca446efdde2ac Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 30 Nov 2022 18:29:04 -0600 Subject: [PATCH] We are always a container pilot, don't let that be overridden (SOFTWARE-5363) --- 10-setup-htcondor.sh | 1 + Dockerfile | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/10-setup-htcondor.sh b/10-setup-htcondor.sh index a7202d1..379a29c 100755 --- 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 index 9886204..20b074b 100644 --- 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=