update status/restore functionality

internet2 · Apr 17, 2024 · 8e17535 · 8e17535
1 parent 8a4e08c
commit 8e17535
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Workbench/scripts/gethealth.py b/Workbench/scripts/gethealth.py
@@ -5,7 +5,7 @@
 print("<table><tr><th style='text-align:left;width:150px'>Container</th><th style='text-align:left'>Health Status</th></tr>")
 for container in containers:
     from subprocess import Popen, PIPE
-    dcmd = "docker ps -f name=workbench_" + container + "_1 --format '{{ .Status }} '"
+    dcmd = "docker ps -f name=workbench-" + container + "-1 --format '{{ .Status }} '"
     pipe = Popen(dcmd, shell=True, stdout=PIPE)
     healthstatus = '<font color="grey">unknown</font>'
     for line in pipe.stdout:

diff --git a/Workbench/scripts/update-health-status.sh b/Workbench/scripts/update-health-status.sh
@@ -2,4 +2,4 @@
 
 /csp-tap/InCommonTAP-Examples/Workbench/scripts/gethealth.py > /csp-tap/InCommonTAP-Examples/Workbench/scripts/gethealth-output.txt
 
-docker cp /csp-tap/InCommonTAP-Examples/Workbench/scripts/gethealth-output.txt workbench_webproxy_1:/var/www/html/status/index.html
+docker cp /csp-tap/InCommonTAP-Examples/Workbench/scripts/gethealth-output.txt workbench-webproxy-1:/var/www/html/status/index.html
diff --git a/Workbench/webproxy/Dockerfile b/Workbench/webproxy/Dockerfile
@@ -40,6 +40,7 @@ RUN sed -i 's/TransferLog logs\/ssl_access_log/TransferLog \/tmp\/logpipe/g' /et
 
 #set hostname
 RUN /usr/local/bin/setservername.sh 
+RUN mkdir -p /run/php-fpm/
 
 HEALTHCHECK --interval=1m --timeout=30s \
   CMD curl -k -f -u csp:workbench https://127.0.0.1/Shibboleth.sso/Status || exit 1

diff --git a/Workbench/webproxy/container_files/system/startWithMDLoad.sh b/Workbench/webproxy/container_files/system/startWithMDLoad.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 /usr/local/bin/startup.sh &
+php-fpm -D &
 
 #wait for IdPUI's API, then load metadata into it
 pushd /mdload