From e6bd8854a19e7d4a7240bbed67dc84acde861619 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 9 Jan 2020 14:16:31 -0500 Subject: [PATCH 1/7] 2.4.0-a88-u55-w11-p12-20200109-rc1 --- container_files/grouper.installer.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties index b49f46e2..f081b8c4 100644 --- a/container_files/grouper.installer.properties +++ b/container_files/grouper.installer.properties @@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install grouperInstaller.autorun.forceInstallPatch = t grouperInstaller.autorun.installAllPatches = false grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true -# 2.4.0-a87-u54-w10-p12-20200102-rc1 -grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_54,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12 +# 2.4.0-a88-u55-w11-p12-20200109-rc1 +grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_88,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12 #### set this to true to try to use defaults for everything. Only things without default values will need to be set From ce4b1d43898ca7d2469b3e1ecc987f804cd8f115 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 9 Jan 2020 14:17:02 -0500 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1707123c..84567891 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118) +[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a88-u55-w11-p12-20200109-rc1)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a88-u55-w11-p12-20200109-rc1) This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally. From 82b97ac2449ca7ea4d5c261e112cc3cccd997007 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 9 Jan 2020 14:46:47 -0500 Subject: [PATCH 3/7] temporary morphString.properties file for build --- container_files/morphString.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 container_files/morphString.properties diff --git a/container_files/morphString.properties b/container_files/morphString.properties new file mode 100644 index 00000000..7c1cc4ca --- /dev/null +++ b/container_files/morphString.properties @@ -0,0 +1 @@ +fh43IRJ4Nf5 From 22847a5a3a259b25c6814fbc159b61698de77bd5 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 9 Jan 2020 14:47:38 -0500 Subject: [PATCH 4/7] install temporary morphString.properties --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 87435e24..601828c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,8 @@ RUN echo 'Downloading Grouper Installer...' \ && wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION +COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION + RUN echo 'Installing Grouper'; \ PATH=$PATH:$JAVA_HOME/bin; \ From 9788217fa8b8eee4d286878c16f90df173b731a4 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 9 Jan 2020 15:00:46 -0500 Subject: [PATCH 5/7] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 601828c8..12116253 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,7 @@ RUN echo 'Downloading Grouper Installer...' \ && wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION +# Temporary morphString file used for building, not used in production COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION From bf865a59134eeaa807fb1063a182bdf7fe814425 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 10 Jan 2020 09:20:08 -0500 Subject: [PATCH 6/7] update dummy encrypt.key --- container_files/morphString.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_files/morphString.properties b/container_files/morphString.properties index 7c1cc4ca..52479216 100644 --- a/container_files/morphString.properties +++ b/container_files/morphString.properties @@ -1 +1 @@ -fh43IRJ4Nf5 +encrypt.key=fh43IRJ4Nf5 From 70d9ca6bedac287392ac46f9bce30de149ccbe0f Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 10 Jan 2020 13:36:22 -0500 Subject: [PATCH 7/7] 2.4.0-a89-u55-w11-p12-20200110-rc1 --- container_files/grouper.installer.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties index f081b8c4..11fcfef9 100644 --- a/container_files/grouper.installer.properties +++ b/container_files/grouper.installer.properties @@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install grouperInstaller.autorun.forceInstallPatch = t grouperInstaller.autorun.installAllPatches = false grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true -# 2.4.0-a88-u55-w11-p12-20200109-rc1 -grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_88,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12 +# 2.4.0-a89-u55-w11-p12-20200110-rc1 +grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_89,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12 #### set this to true to try to use defaults for everything. Only things without default values will need to be set