Merge pull request #77 from docker/2.4.0-a74-u44-w8-p11-20190929-rc1

2.4.0-a74-u44-w8-p11-20190929-rc1
docker · Sep 30, 2019 · 0befb83 · 0befb83
2 parents 4bb651d + 7836648
commit 0befb83
Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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

diff --git 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 \