From 6c9f7712810cc0164ccdd9d8fab9c033108b74a9 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 29 May 2020 20:56:04 +0000 Subject: [PATCH] fix propagation of env vars downstream --- Dockerfile | 2 +- container_files/system/startup.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8aad662..ecda6ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV TOMCAT_MAJOR=9 \ ##shib-idp \ VERSION=4.0.0 \ ##TIER \ - TIERVERSION=20200518 \ + TIERVERSION=20200529 \ #################### \ #### OTHER VARS #### \ #################### \ diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh index 7b3e33c..7554946 100644 --- a/container_files/system/startup.sh +++ b/container_files/system/startup.sh @@ -1,5 +1,9 @@ #!/bin/sh +#set env vars for cron jobs +# this script creates /opt/tier/env.bash which is sourced by the cron jobs' scripts +/opt/tier/setenv.sh + #for passed-in env vars, remove spaces and replace any ; with : in usertoken env var since we will use ; as a delimiter export USERTOKEN="${USERTOKEN//;/:}" export USERTOKEN="${USERTOKEN// /}"