Merge pull request #63 from docker/2.4.0-a42-u23-w5-p4-20190426-rc1

2.4.0 a42 u23 w5 p4 20190426 rc1
docker · Apr 26, 2019 · 2c77fb4 · 2c77fb4
2 parents 8f164fd + cc5917b
commit 2c77fb4
Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -89,7 +89,7 @@ COPY container_files/tomcat/ /opt/tomcat/
 COPY container_files/tomee/ /opt/tomee/
 
 
-FROM tier/shibboleth_sp
+FROM tier/shibboleth_sp:3.0.4_03122019
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
@@ -16,7 +16,8 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_41,grouper_v2_4_0_ui_patch_22,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
+# 2.4.0-a42-u23-w5-p4-20190426-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set