From 5f9bb5e2f1af68ce56a0c5ec219f359a26a115d8 Mon Sep 17 00:00:00 2001 From: mchyzer Date: Tue, 5 May 2020 00:24:55 -0400 Subject: [PATCH] update version so grouper doesnt hang --- .gitignore | 1 + base/Dockerfile | 4 ++-- base/container_files/usr-local-bin/grouper | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 18c758b..263d349 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ tmp .vscode/settings.json .DS_Store _build +/.project diff --git a/base/Dockerfile b/base/Dockerfile index ea242cf..6d48886 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.26 +FROM i2incommon/grouper:2.5.27 # Disable docker HEALTHCHECK inherited from tier/shib-sp HEALTHCHECK NONE @@ -78,7 +78,7 @@ COPY container_files/tls/* /etc/pki/tls/certs/ COPY container_files/usr-local-bin/* /usr/local/bin/ COPY container_files/var-www-html/ /var/www/html/ -#RUN cp /opt/tier-support/grouper.xml /opt/tier-support/grouper-ws.xml /opt/tomcat/conf/Catalina/localhost/ \ +#RUN cp /opt/tier-support/grouper.xml /opt/tier-support/grouper-ws.xml /opt/tomee/conf/Catalina/localhost/ \ RUN chown -R tomcat /opt/shibboleth-idp/ \ && chmod -R 700 /opt/shibboleth-idp/ \ && chmod +rx /var/www/html/app/index.py \ diff --git a/base/container_files/usr-local-bin/grouper b/base/container_files/usr-local-bin/grouper index dd722b9..984bee3 100755 --- a/base/container_files/usr-local-bin/grouper +++ b/base/container_files/usr-local-bin/grouper @@ -6,7 +6,7 @@ prepDaemon prepUI prepWS -export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH +finishPrep exec /usr/bin/supervisord -c /opt/tier-support/supervisord-training.conf