From ad473b30b86793b25b6993d972b65ee1797847e1 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-20-207.us-west-2.compute.internal>
Date: Tue, 20 Sep 2022 21:05:47 +0000
Subject: [PATCH] bump IdP-UI to 1.13.2

---
 Workbench/docker-compose.yml                  | 24 +++++++++----------
 Workbench/idp_ui/Dockerfile                   |  2 +-
 .../container_files/idp_ui/application.yml    | 15 ++++++------
 Workbench/idp_ui_api/Dockerfile               | 10 +-------
 .../container_files/idp_ui/application.yml    | 15 ++++++------
 .../webproxy/container_files/httpd/index.html |  2 +-
 6 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
index d1aaa3b..f60b4b8 100644
--- a/Workbench/docker-compose.yml
+++ b/Workbench/docker-compose.yml
@@ -390,28 +390,27 @@ services:
     volumes:
      - generated-metadata:/generated-metadata
      - generated-config:/generated-config
-
+ 
   idp_ui_data:
-    image: tier/mariadb:mariadb10.2
-    ports:
-     - 33366:3306
+    image: postgres
     environment:
-      MYSQL_USER: shibui
-      MYSQL_PASSWORD: secret
-      MYSQL_DATABASE: shibui
-      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      POSTGRES_USER: shibui
+      POSTGRES_PASSWORD: secret
+      POSTGRES_DB: shibui
     networks:
       net:
         aliases:
          - idpui-data
+    ports:
+      - 15432:5432
     healthcheck:
-      test: curl -s 127.0.0.1:3306
+      test: /usr/local/bin/pg_isready
       interval: 30s
       timeout: 30s
       retries: 3
     volumes:
-    - mariadb-data:/var/lib/mysql
-    
+     - idpui_data:/var/lib/postgresql/data
+
   mq:
     build: ./mq/
     environment:
@@ -437,8 +436,6 @@ services:
         - CSPHOSTNAME
     networks:
      - net
-    depends_on:
-      - idp_ui_api
     ports:
      - 443:443
      
@@ -584,3 +581,4 @@ volumes:
   generated-config:
   generated-metadata:
   mariadb-data:
+  idpui_data:
diff --git a/Workbench/idp_ui/Dockerfile b/Workbench/idp_ui/Dockerfile
index 2f449e3..9c8bf86 100644
--- a/Workbench/idp_ui/Dockerfile
+++ b/Workbench/idp_ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/shib-idp-ui:1.9.2
+FROM i2incommon/shib-idp-ui:1.13.2
 
 ARG CSPHOSTNAME=localhost
 ENV CSPHOSTNAME=$CSPHOSTNAME
diff --git a/Workbench/idp_ui/container_files/idp_ui/application.yml b/Workbench/idp_ui/container_files/idp_ui/application.yml
index cf04975..e5ccd7f 100644
--- a/Workbench/idp_ui/container_files/idp_ui/application.yml
+++ b/Workbench/idp_ui/container_files/idp_ui/application.yml
@@ -35,14 +35,15 @@ shibui:
       email: urn:oid:0.9.2342.19200300.100.1.3
 spring:
   datasource:
+    platform: postgres
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://idpui-data:5432/shibui
     username: shibui
     password: secret
-    url: jdbc:mariadb://idpui-data:3306/shibui
-    driverClassName: org.mariadb.jdbc.Driver
-    platform: mariadb
   jpa:
-    database-platform: org.hibernate.dialect.MariaDBDialect
-    hibernate:
-      ddl-auto: update
+    show-sql: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQL95Dialect
+        format_sql: true
 
-     
diff --git a/Workbench/idp_ui_api/Dockerfile b/Workbench/idp_ui_api/Dockerfile
index 83f88d3..5eb3e5b 100644
--- a/Workbench/idp_ui_api/Dockerfile
+++ b/Workbench/idp_ui_api/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/shib-idp-ui:1.9.2
+FROM i2incommon/shib-idp-ui:1.13.2
 
 ARG CSPHOSTNAME=localhost
 ENV CSPHOSTNAME=$CSPHOSTNAME
@@ -7,12 +7,4 @@ COPY container_files/idp_ui/application.yml /opt/shibui/
 COPY container_files/idp_ui/shibui-test.p12 /opt/shibui/
 COPY container_files/idp_ui/users.txt /opt/shibui/
 
-#RUN mkdir -p /opt/shibui/saml/
-##COPY container_files/idp_ui/samlkeystore.jks /opt/shibui/saml/
-#COPY container_files/idp_ui/idp-metadata.xml /opt/shibui/saml/
-
-#COPY container_files/system/setservername.sh /usr/local/bin/
-#RUN chmod 755 /usr/local/bin/setservername.sh
-#RUN /usr/local/bin/setservername.sh
-  
 EXPOSE 8443
diff --git a/Workbench/idp_ui_api/container_files/idp_ui/application.yml b/Workbench/idp_ui_api/container_files/idp_ui/application.yml
index de6eb0b..f249ed8 100644
--- a/Workbench/idp_ui_api/container_files/idp_ui/application.yml
+++ b/Workbench/idp_ui_api/container_files/idp_ui/application.yml
@@ -23,14 +23,15 @@ shibui:
     authentication-header: IDPUI_API_KEY
 spring:
   datasource:
+    platform: postgres
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://idpui-data:5432/shibui
     username: shibui
     password: secret
-    url: jdbc:mariadb://idpui-data:3306/shibui
-    driverClassName: org.mariadb.jdbc.Driver
-    platform: mariadb
   jpa:
-    database-platform: org.hibernate.dialect.MariaDBDialect
-    hibernate:
-      ddl-auto: update
+    show-sql: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQL95Dialect
+        format_sql: true
 
-     
diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
index fa33d39..23c24f0 100644
--- a/Workbench/webproxy/container_files/httpd/index.html
+++ b/Workbench/webproxy/container_files/httpd/index.html
@@ -12,7 +12,7 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <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.4)</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>
+<li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.13.2)</a></li>
 </ul>
 
 <br />