Skip to content
Permalink
Browse files

Merge pull request #83 from docker/4.0.1_20200603

merge 4.0.1 20200603
  • Loading branch information
pcaskey committed Jun 3, 2020
2 parents 642f7bb + 85c6540 commit 20f3bc8d2930251bba9e5711415af7e23fe4f89e
Showing with 7 additions and 3 deletions.
  1. +2 −2 Dockerfile
  2. +1 −1 container_files/idp/idp.installer.properties
  3. +4 −0 container_files/system/startup.sh
@@ -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 #### \
#################### \
@@ -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
@@ -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// /}"

0 comments on commit 20f3bc8

Please sign in to comment.
You can’t perform that action at this time.