Merge branch 'main' into PC_idpui_intg

internet2 · Oct 1, 2021 · 3684605 · 3684605
2 parents d26f94f + d5cd923
commit 3684605
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 7 deletions.
diff --git a/Workbench/comanage/Dockerfile b/Workbench/comanage/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/comanage-registry:3.3.2-20210318
+FROM i2incommon/comanage-registry:3.3.4-20210712
 
 ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
 ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson

diff --git a/Workbench/comanage_cron/Dockerfile b/Workbench/comanage_cron/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/comanage-registry-cron:3.3.2-20210318
+FROM i2incommon/comanage-registry-cron:3.3.4-20210712
 
 ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
 ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson

diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-FROM i2incommon/grouper:2.5.37.1
+FROM i2incommon/grouper:2.6.0
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 
diff --git 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.6.0
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 

diff --git 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.6.0
+
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 
 ARG CSPHOSTNAME=localhost

diff --git 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.6.0
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 

diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
@@ -7,12 +7,14 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 For complete documentation, see <a href="https://spaces.at.internet2.edu/x/-IKeCg" target="_blank">this page</a>.
 <br /><br />
 The system contains the following TAP components (click the links to access each component in its own tab):
+
 <ul>
 <li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper (2.6.0)</a></li>
 <li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.3.2)</a></li>
 <li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage Registry (3.3.4)</a></li>
 <li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.9.2)</a></li>
 </ul>
+
 <br />
 The system also contains the following downstream/target applications:
 <ul>