From 0ad707b4e210e98e1cb317e45ad6a206dbd6de62 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 12 Mar 2020 16:35:11 +0000
Subject: [PATCH] merge fix

---
 Dockerfile                  | 6 +++---
 test-compose/idp/Dockerfile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cc21e16..8dc949f 100644
--- 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
index 671b9ad..fa052c8 100644
--- 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