diff --git a/Workbench/configs-and-secrets/grouper/application/grouper.properties b/Workbench/configs-and-secrets/grouper/application/grouper.properties index c931287..086d9a6 100644 --- a/Workbench/configs-and-secrets/grouper/application/grouper.properties +++ b/Workbench/configs-and-secrets/grouper/application/grouper.properties @@ -23,3 +23,9 @@ groups.wheel.group = etc:sysadmingroup # Used to allow Include Exclude groups grouperIncludeExclude.use = true grouperIncludeExclude.requireGroups.use = true + +# to allow periods in id paths, changed with grouper 2.5.49 +stem.validateExtensionByDefault = false +group.validateExtensionByDefault = false +attributeDef.validateExtensionByDefault = false +attributeDefName.validateExtensionByDefault = false diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index 75f0300..13b8a9a 100644 --- a/Workbench/docker-compose.yml +++ b/Workbench/docker-compose.yml @@ -87,9 +87,11 @@ services: - type: bind source: ./configs-and-secrets/grouper/shibboleth/shibboleth2.xml target: /etc/shibboleth/shibboleth2.xml + # Note: due to a bug in https://github.internet2.edu/docker/grouper/blob/2.5.57/container_files/usr-local-bin/librarySetupFilesForProcess.sh#L72 + # This file had to be mounted as shib2.conf, instead of shib.conf (bind mounts don't want to be moved) - type: bind source: ./configs-and-secrets/grouper/httpd/shib.conf - target: /etc/httpd/conf.d/shib.conf + target: /etc/httpd/conf.d/shib2.conf - type: bind source: ./configs-and-secrets/grouper/httpd/host-cert.pem target: /etc/pki/tls/certs/host-cert.pem diff --git a/Workbench/grouper_daemon/Dockerfile b/Workbench/grouper_daemon/Dockerfile index cf60abe..0602528 100644 --- a/Workbench/grouper_daemon/Dockerfile +++ b/Workbench/grouper_daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/grouper:2.5.37.1 +FROM i2incommon/grouper:2.5.57 LABEL author="tier-packaging@internet2.edu " diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile index 547520e..a24d3dc 100644 --- a/Workbench/grouper_data/Dockerfile +++ b/Workbench/grouper_data/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/grouper:2.5.37.1 +FROM i2incommon/grouper:2.5.57 LABEL author="tier-packaging@internet2.edu " diff --git a/Workbench/grouper_ui/Dockerfile b/Workbench/grouper_ui/Dockerfile index 34cdcef..4aae88d 100644 --- a/Workbench/grouper_ui/Dockerfile +++ b/Workbench/grouper_ui/Dockerfile @@ -1,4 +1,5 @@ -FROM i2incommon/grouper:2.5.37.1 +FROM i2incommon/grouper:2.5.57 + LABEL author="tier-packaging@internet2.edu " ARG CSPHOSTNAME=localhost diff --git a/Workbench/grouper_ws/Dockerfile b/Workbench/grouper_ws/Dockerfile index 71901bf..fa7137b 100644 --- a/Workbench/grouper_ws/Dockerfile +++ b/Workbench/grouper_ws/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/grouper:2.5.37.1 +FROM i2incommon/grouper:2.5.57 LABEL author="tier-packaging@internet2.edu " diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html index 3ae1c56..82e26ca 100644 --- a/Workbench/webproxy/container_files/httpd/index.html +++ b/Workbench/webproxy/container_files/httpd/index.html @@ -8,10 +8,12 @@

Welcome to the InCommon TAP Workbench!



The system contains the following TAP components (click the links to access each component in its own tab):
The system also contains the following downstream/target applications: