update status pg

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

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Workbench/ad/Dockerfile b/Workbench/ad/Dockerfile
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get upgrade -y
 RUN apt-get install -y pkg-config
 RUN apt-get install -y attr acl samba smbclient ldap-utils winbind libnss-winbind libpam-winbind krb5-user krb5-kdc supervisor
-RUN apt-get install -y openvpn inetutils-ping
+RUN apt-get install -y openvpn inetutils-ping net-tools
 
 ADD container_files/certs/ /var/lib/samba/private/tls/
 RUN chmod 600 /var/lib/samba/private/tls/key.pem

diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
@@ -581,6 +581,11 @@ services:
       context: ./ad/
     cap_add:
       - CAP_SYS_ADMIN
+    healthcheck:
+      test: netstat -an | grep :3268 | grep LISTEN
+      interval: 30s
+      timeout: 30s
+      retries: 3
     environment:
      - DOMAIN=ad.example.edu
      - DOMAINPASS=Password1

diff --git a/Workbench/scripts/gethealth.py b/Workbench/scripts/gethealth.py
@@ -1,6 +1,6 @@
 #!/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", "midpoint_server", "midpoint_data", "webproxy", "wordpress_server", "wordpress_data", "mq", "directory", "sources"]
+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", "wordpress_server", "wordpress_data", "mq", "directory", "sources", "ad", "comanage_midpoint_data"]
 
 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: