merge fix

docker · Mar 12, 2020 · 0ad707b · 0ad707b
1 parent 3417633
commit 0ad707b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,9 +11,9 @@ ENV TOMCAT_MAJOR=9 \
     VERSION=4.0.0 \
 ##TIER \
     TIERVERSION=20200311 \
-################## \
-### OTHER VARS ### \
-################## \
+#################### \
+#### OTHER VARS #### \
+#################### \
 # \
 #global \
     IMAGENAME=shibboleth_idp \

diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile
@@ -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.
 ARG TOMCFG=config/tomcat