From e5ce39746045f0c190422d812e56cafe57d3b535 Mon Sep 17 00:00:00 2001
From: mchyzer <mchyzer@macbook-pro-103.lan>
Date: Sat, 16 May 2020 14:59:05 -0400
Subject: [PATCH] upgrade to grouper 2.5.28
---
base/Dockerfile | 7 ++++++-
.../tier-support/supervisord-training.conf | 3 ++-
base/container_files/usr-local-bin/grouper | 11 ++++++-----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/base/Dockerfile b/base/Dockerfile
index 6d48886..013900a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,7 +1,7 @@
FROM tier/shib-idp:3.4.3_20190201 as idp
# Grouper version for the entire GTE
-FROM i2incommon/grouper:2.5.27
+FROM i2incommon/grouper:2.5.28
# Disable docker HEALTHCHECK inherited from tier/shib-sp
HEALTHCHECK NONE
@@ -84,6 +84,11 @@ RUN chown -R tomcat /opt/shibboleth-idp/ \
&& chmod +rx /var/www/html/app/index.py \
&& /opt/shibboleth-idp/bin/build.sh
+RUN chown -R tomcat:tomcat /opt/grouper/grouperWebapp
+RUN chown -R tomcat:tomcat /opt/tomee
+
+ENV GROUPER_START_DELAY_SECONDS=10
+
EXPOSE 389 3306 4443
CMD ["grouper"]
diff --git a/base/container_files/tier-support/supervisord-training.conf b/base/container_files/tier-support/supervisord-training.conf
index d4e0e64..3dcc162 100644
--- a/base/container_files/tier-support/supervisord-training.conf
+++ b/base/container_files/tier-support/supervisord-training.conf
@@ -33,7 +33,8 @@ priority=15
[program:tomcat]
user=tomcat
-command=bash -c "while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 3; done; exec /opt/tomee/bin/catalina.sh run"
+#command=bash -c "while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 3; done; exec /opt/tomee/bin/catalina.sh run"
+command=/opt/tomee/bin/catalina.sh run
stderr_logfile = /tmp/logtomcat
stderr_logfile_maxbytes=0
stdout_logfile = /tmp/logtomcat
diff --git a/base/container_files/usr-local-bin/grouper b/base/container_files/usr-local-bin/grouper
index 984bee3..77fe0c7 100755
--- a/base/container_files/usr-local-bin/grouper
+++ b/base/container_files/usr-local-bin/grouper
@@ -1,12 +1,13 @@
#!/bin/bash
. /usr/local/bin/library.sh
+prep_conf
-prepDaemon
-prepUI
-prepWS
-
-finishPrep
+prep_ui
+prep_daemon
+prep_ws
+prep_finish
+setupFiles
exec /usr/bin/supervisord -c /opt/tier-support/supervisord-training.conf