Skip to content

Commit

Permalink
update version so grouper doesnt hang
Browse files Browse the repository at this point in the history
  • Loading branch information
mchyzer committed May 5, 2020
1 parent deaf7d6 commit 5f9bb5e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ tmp
.vscode/settings.json
.DS_Store
_build
/.project
4 changes: 2 additions & 2 deletions base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion base/container_files/usr-local-bin/grouper
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5f9bb5e

Please sign in to comment.