From 598f72ccaa11bf8d2c9170db808ac3770d3a2065 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Aug 2024 19:22:29 +0000 Subject: [PATCH] bump IdP to 5.1.3 --- Workbench/idp/Dockerfile | 2 +- Workbench/scripts/gethealth.py | 7 +++++-- Workbench/webproxy/container_files/httpd/index.html | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Workbench/idp/Dockerfile b/Workbench/idp/Dockerfile index b9db70d..b418aef 100644 --- a/Workbench/idp/Dockerfile +++ b/Workbench/idp/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/shib-idp:5.1.2_20240415_rocky8_multiarch +FROM i2incommon/shib-idp:5.1.3_20240813_rocky8_multiarch LABEL author="tier-packaging@internet2.edu " diff --git a/Workbench/scripts/gethealth.py b/Workbench/scripts/gethealth.py index ba23e09..1755cad 100755 --- a/Workbench/scripts/gethealth.py +++ b/Workbench/scripts/gethealth.py @@ -1,11 +1,14 @@ #!/bin/python -containers = ["idp", "idp_ui", "idp_ui_data", "idp_ui_api", "grouper_ui", "grouper_ws", "grouper_daemon", "grouper_data", "comanage", "comanage_cron", "comanage_data", "evolveum/midpoint", "midpoint_data", "webproxy", "mpproxy", "wordpress_server", "wordpress_data", "mq", "directory", "sources", "ad", "comanage_midpoint_data"] +containers = ["idp", "idp_ui", "idp_ui_data", "idp_ui_api", "grouper_ui", "grouper_ws", "grouper_daemon", "grouper_data", "comanage", "comanage_cron", "comanage_data", "midpoint_server", "midpoint_data", "webproxy", "mpproxy", "wordpress_server", "wordpress_data", "mq", "directory", "sources", "ad", "comanage_midpoint_data"] print("") for container in containers: from subprocess import Popen, PIPE - dcmd = "docker ps -f name=workbench-" + container + "-1 --format '{{ .Status }} '" + if container == "midpoint_server": + dcmd = "docker ps -f name=" + container + " --format '{{ .Status }} '" + else: + dcmd = "docker ps -f name=workbench-" + container + "-1 --format '{{ .Status }} '" pipe = Popen(dcmd, shell=True, stdout=PIPE) healthstatus = 'unknown' for line in pipe.stdout: diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html index b551c0c..f880778 100644 --- a/Workbench/webproxy/container_files/httpd/index.html +++ b/Workbench/webproxy/container_files/httpd/index.html @@ -33,7 +33,7 @@

Welcome to the InCommon TAP Workbench!


Shibboleth SAML Identity Provider and Service Providers:
ContainerHealth Status