diff --git a/Dockerfile b/Dockerfile index 8aad662..99d4318 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,9 @@ FROM centos:centos7 ENV TOMCAT_MAJOR=9 \ TOMCAT_VERSION=9.0.35 \ ##shib-idp \ - VERSION=4.0.0 \ + VERSION=4.0.1 \ ##TIER \ - TIERVERSION=20200518 \ + TIERVERSION=20200603 \ #################### \ #### OTHER VARS #### \ #################### \ diff --git a/container_files/idp/idp.installer.properties b/container_files/idp/idp.installer.properties index ace3ea1..45f454b 100644 --- a/container_files/idp/idp.installer.properties +++ b/container_files/idp/idp.installer.properties @@ -1,4 +1,4 @@ -idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.0 +idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.1 idp.target.dir=/opt/shibboleth-idp idp.host.name=idp.example.org idp.sealer.password=changeit 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// /}"