Skip to content

Commit

Permalink
fix propagation of env vars downstream
Browse files Browse the repository at this point in the history
  • Loading branch information
pcaskey committed May 29, 2020
1 parent 5e4307c commit 6c9f771
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ENV TOMCAT_MAJOR=9 \
##shib-idp \
VERSION=4.0.0 \
##TIER \
TIERVERSION=20200518 \
TIERVERSION=20200529 \
#################### \
#### OTHER VARS #### \
#################### \
Expand Down
4 changes: 4 additions & 0 deletions container_files/system/startup.sh
Original file line number Diff line number Diff line change
@@ -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// /}"
Expand Down

0 comments on commit 6c9f771

Please sign in to comment.