From b85cda4db926af3cec00b2d2512653c4f45615a8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Feb 2020 21:02:20 -0500
Subject: [PATCH 1/5] Update Dockerfile
---
Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6fdf32bd..1a6b25a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN yum update -y \
ARG GROUPER_CONTAINER_VERSION
-ENV GROUPER_VERSION=2.4.0 \
+ENV GROUPER_VERSION=2.5.8 \
JAVA_HOME=/usr/lib/jvm/zulu-8/ \
GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
@@ -36,7 +36,8 @@ RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
RUN echo 'Downloading Grouper Installer...' \
&& mkdir -p /opt/grouper/$GROUPER_VERSION \
- && wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar
+ && wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar https://oss.sonatype.org/service/local/repositories/releases/content/edu/internet2/middleware/grouper/grouper-installer/$GROUPER_VERSION/grouper-installer-$GROUPER_VERSION.jar
+
COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION
# Temporary morphString file used for building, not used in production
From e971290735498326075920b8f9e52d17d5d971d8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Feb 2020 21:06:25 -0500
Subject: [PATCH 2/5] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 45 --------------------
1 file changed, 45 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index c63c9d5f..ac0b225e 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -1,46 +1 @@
-# this should be before the version number
download.server.url = https://software.internet2.edu/grouper
-# default version to install
-grouper.version = 2.4.0
-# print out autorun keys in prompts so you can easily see how to configure the autorun
-grouperInstaller.print.autorunKeys = true
-# default to install or upgrade (default is install)
-grouperInstaller.default.installOrUpgrade = install
-
-##############################
-## Autorun properties
-##
-## If you uncomment one of these properties it will be used as empty, only uncomment to use
-##
-##############################
-
-grouperInstaller.autorun.forceInstallPatch = t
-grouperInstaller.autorun.installAllPatches = false
-grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a91-u56-w11-p12-20200210-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_91,grouper_v2_4_0_ui_patch_56,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
-grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true
-########## AUTORUN PROPERTIES WITH NO DEFAULT OR ARE COMMONLY CHANGED
-## Note: not all of them need to be filled out for all operations
-# autorun grouper system password (its not secure to have a plain text pass in a config file)
-grouperInstaller.autorun.grouperSystemPassword = XXXXXXXXXX
-
-grouperInstaller.autorun.deleteAndInitDatabase = t
-grouperInstaller.autorun.addQuickstartData = f
-grouperInstaller.autorun.installClient = f
-
-grouperInstaller.autorun.installGrouperActiveMqMessaging = f
-grouperInstaller.autorun.activeMqWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
-
-grouperInstaller.autorun.installGrouperAwsSqsMessaging = t
-grouperInstaller.autorun.AwsSqsWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
-
-grouperInstaller.autorun.installGrouperRabbitMqMessaging = t
-grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
-
-# disable installing pspng, for now
-grouperInstaller.autorun.installPspng = t
-grouperInstaller.autorun.installPsp = f
From a57566b2176616737cfd9d84cf22c8a2833ea271 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Feb 2020 21:10:45 -0500
Subject: [PATCH 3/5] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ac0b225e..dc909559 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -1 +1,2 @@
download.server.url = https://software.internet2.edu/grouper
+grouper.version = 2.5.8
From 5e1d061ec82691ad7a4e6fb2149fc04267fc6c6c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Feb 2020 21:13:19 -0500
Subject: [PATCH 4/5] Update Dockerfile
---
Dockerfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1a6b25a3..9e00d924 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
FROM centos:centos7 as installing
-RUN yum update -y \
- && yum install -y wget tar unzip dos2unix \
- && yum clean all
+#RUN yum update -y \
+# && yum install -y wget tar unzip dos2unix \
+# && yum clean all
+
+RUN yum install -y wget tar unzip dos2unix
ARG GROUPER_CONTAINER_VERSION
@@ -53,7 +55,7 @@ RUN echo 'Installing Grouper'; \
FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.4.0 \
+ENV GROUPER_VERSION=2.5.8 \
TOMCAT_VERSION=8.5.42 \
TOMEE_VERSION=7.0.0
From 9c457e5bd0f194669f984e1b14adf35477ea4fd4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Feb 2020 21:31:32 -0500
Subject: [PATCH 5/5] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index dc909559..70792621 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -1,2 +1,17 @@
download.server.url = https://software.internet2.edu/grouper
grouper.version = 2.5.8
+
+# print out autorun keys in prompts so you can easily see how to configure the autorun
+grouperInstaller.print.autorunKeys = true
+# default to install or upgrade (default is install)
+grouperInstaller.default.installOrUpgrade = install
+
+##############################
+## Autorun properties
+##
+## If you uncomment one of these properties it will be used as empty, only uncomment to use
+##
+##############################
+
+grouperInstaller.autorun.forceInstallPatch = t
+grouperInstaller.autorun.installAllPatches = true