From f1d4f8ef0f2877c6a6086f81ffe2b7223db10ac3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 29 Sep 2019 18:51:25 -0400
Subject: [PATCH 1/2] 2.4.0-a74-u44-w8-p11-20190929-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 e74a0f5f..809bbbe5 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-a64-u38-w6-p6-20190612-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_64,grouper_v2_4_0_ui_patch_38,grouper_v2_4_0_ws_patch_6,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a74-u44-w8-p11-20190929-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_44,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 7836648e8642251273a0007204096297ed506639 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 29 Sep 2019 20:00:53 -0400
Subject: [PATCH 2/2] Update Dockerfile
---
test-compose/data/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-compose/data/Dockerfile b/test-compose/data/Dockerfile
index cbb3ca2d..e4ffb7f8 100644
--- a/test-compose/data/Dockerfile
+++ b/test-compose/data/Dockerfile
@@ -11,7 +11,7 @@ RUN yum install -y epel-release \
&& yum clean all \
&& rm -rf /var/cache/yum
-RUN mysql_install_db \
+RUN mysql_install_db --force \
&& chown -R mysql:mysql /var/lib/mysql/ \
&& sed -i 's/^\(bind-address\s.*\)/# \1/' /etc/my.cnf \
&& sed -i 's/^\(log_error\s.*\)/# \1/' /etc/my.cnf \