Skip to content
Permalink
Browse files

merge fix

  • Loading branch information
pcaskey committed Mar 12, 2020
1 parent 3417633 commit 0ad707b4e210e98e1cb317e45ad6a206dbd6de62
Showing with 4 additions and 4 deletions.
  1. +3 −3 Dockerfile
  2. +1 −1 test-compose/idp/Dockerfile
@@ -11,9 +11,9 @@ ENV TOMCAT_MAJOR=9 \
VERSION=4.0.0 \ VERSION=4.0.0 \
##TIER \ ##TIER \
TIERVERSION=20200311 \ TIERVERSION=20200311 \
################## \ #################### \
### OTHER VARS ### \ #### OTHER VARS #### \
################## \ #################### \
# \ # \
#global \ #global \
IMAGENAME=shibboleth_idp \ IMAGENAME=shibboleth_idp \
@@ -1,4 +1,4 @@
FROM tier/shib-idp:4.0.beta2_20200228 FROM tier/shib-idp:4.0.0_20200311


# The build args below can be used at build-time to tell the build process where to find your config files. This is for a completely burned-in config. # The build args below can be used at build-time to tell the build process where to find your config files. This is for a completely burned-in config.
ARG TOMCFG=config/tomcat ARG TOMCFG=config/tomcat

0 comments on commit 0ad707b

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