Mercurial > public > ssdt-docker

changeset 607:3ec3180d23a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Justin Kleinknecht <justin.kleinknecht@mcoecn.org>
date Tue, 01 Jul 2025 20:51:22 +0100
parents 2aebef3e31bf (current diff) f05817aee0f0 (diff)
children 5cb80996e4d5
files scripts/backup-document-store.sh scripts/backup-ess.sh scripts/backup-itcm.sh scripts/list-document-store-snapshots.sh scripts/restore-document-store.sh scripts/restore-ess.sh scripts/restore-itcm.sh tomcat-17/setenv.sh
diffstat 30 files changed, 130 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/init.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/init.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -8,5 +8,5 @@
 export SSDT_HOME=$(getSsdtHomeDir)
 export SSDT_SCRIPTS=${SSDT_HOME}/scripts
 source "${SSDT_SCRIPTS}/.functions.sh"
-alias utils='docker run -it -v ${PWD}:/tmp -v $SSDT_HOME:/ssdt --rm docker.ssdt.io/ssdt-utils'
+alias utils='docker run -it -v ${PWD}:/tmp -v $SSDT_HOME:/ssdt --rm docker.ssdt-ohio.org/ssdt-utils'
 alias send2ssdt='${SSDT_SCRIPTS}/send.sh'
--- a/prod/import-usas.yml	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/import-usas.yml	Tue Jul 01 20:51:22 2025 +0100
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   usasimport:
-    image: docker.ssdt.io/usas-import:${USAS_TAG:-prod}
+    image: docker.ssdt-ohio.org/usas-import:${USAS_TAG:-prod}
     command: -i ${IMP_IRN- } -u ${IMP_URL- } -r ${IMP_PATH- }
     depends_on:
       - usasdb
@@ -9,4 +9,4 @@
       - DB_HOST=usasdb
       - DB_NAME=usasdb
       - DB_USER=usas
-      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
\ No newline at end of file
+      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
--- a/prod/import-usps.yml	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/import-usps.yml	Tue Jul 01 20:51:22 2025 +0100
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   uspsimport:
-    image: docker.ssdt.io/usps-import:${USPS_TAG:-prod}
+    image: docker.ssdt-ohio.org/usps-import:${USPS_TAG:-prod}
     command: -i ${IMP_IRN- } -u ${IMP_URL- } -r ${IMP_PATH- } ${IMP_ANON- } ${IMP_EM- }
     depends_on:
       - uspsdb
@@ -10,4 +10,3 @@
       - DB_NAME=uspsdb
       - DB_USER=usps
       - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
- 
\ No newline at end of file
--- a/prod/install-ess-app.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/install-ess-app.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -71,6 +71,19 @@
 fi
 #
 #
+if [ ! -z "$miniOrangeEnabled" ]; then
+    echo "Adding MiniOrange Configuration"
+    dockerRunCommand="$dockerRunCommand
+        -e MINI_ORANGE_ENABLED=$miniOrangeEnabled
+        -e MINI_ORANGE_CLIENT_ID=$miniOrangeClientId
+        -e MINI_ORANGE_CLIENT_SECRET=$miniOrangeClientSecret
+        -e MINI_ORANGE_API_HOSTNAME=$miniOrangeApiHostname
+        -e MINI_ORANGE_FAIL_OPEN=$miniOrangeFailOpen
+        -e MINI_ORANGE_APP_HOST=$miniOrangeEssHost
+        -e MINI_ORANGE_MINUTES_UNTIL_EXPIRATION=$miniOrangeMinutesUntilExpiration"
+fi
+#
+#
 if [ ! -z "$ads_config1_enabled" ]; then
     echo "Add Window Active Director Configuration 1"
     dockerRunCommand="$dockerRunCommand
@@ -104,6 +117,13 @@
 fi
 #
 #
+support_instance=${support_instance:-false}
+if [ "$support_instance" = "true" ]; then
+    echo "Setting application instance type to Support"
+    dockerRunCommand="$dockerRunCommand -e APPLICATION_INSTANCE_TYPE=Support"
+fi
+#
+#
 dockerRunCommand="$dockerRunCommand -d $artifactUrl/ess-app:$appVersion"
 #
 # Execute constructed docker run command to create $entityId-ess-app container connected to db and docker network
--- a/prod/install-inventory-app.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/install-inventory-app.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -46,6 +46,13 @@
     dockerRunCommand="$dockerRunCommand -e DUO_USXS_HOST=$duo_usxs_host -e DUO_USXS_PORT=$duo_usxs_port -e DUO_USXS_CONTEXT=$duo_usxs_context -e DUO_MINUTES_UNTIL_EXPIRATION=$duo_minutes_until_expiration "
 fi
 #
+#
+if [ ! -z "$miniOrangeEnabled" ]; then
+    echo "Adding MiniOrange Configuration"
+    dockerRunCommand="$dockerRunCommand -e MINI_ORANGE_ENABLED=$miniOrangeEnabled -e MINI_ORANGE_CLIENT_ID=$miniOrangeClientId -e MINI_ORANGE_CLIENT_SECRET=$miniOrangeClientSecret -e MINI_ORANGE_API_HOSTNAME=$miniOrangeApiHostname "
+    dockerRunCommand="$dockerRunCommand -e MINI_ORANGE_FAIL_OPEN=$miniOrangeFailOpen -e MINI_ORANGE_APP_HOST=$miniOrangeEssHost -e MINI_ORANGE_MINUTES_UNTIL_EXPIRATION=$miniOrangeMinutesUntilExpiration "
+fi
+#
 dockerRunCommand="$dockerRunCommand -d $artifactUrl/inventory-app:$appVersion"
 #
 # Execute constructed docker run command to create $entityId-inventory-app container connected to db and docker network
--- a/prod/install-itcm-app.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/install-itcm-app.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -61,6 +61,19 @@
 fi
 #
 #
+if [ ! -z "$miniOrangeEnabled" ]; then
+    echo "Adding MiniOrange Configuration"
+    dockerRunCommand="$dockerRunCommand
+        -e MINI_ORANGE_ENABLED=$miniOrangeEnabled
+        -e MINI_ORANGE_CLIENT_ID=$miniOrangeClientId
+        -e MINI_ORANGE_CLIENT_SECRET=$miniOrangeClientSecret
+        -e MINI_ORANGE_API_HOSTNAME=$miniOrangeApiHostname
+        -e MINI_ORANGE_FAIL_OPEN=$miniOrangeFailOpen
+        -e MINI_ORANGE_APP_HOST=$miniOrangeEssHost
+        -e MINI_ORANGE_MINUTES_UNTIL_EXPIRATION=$miniOrangeMinutesUntilExpiration"
+fi
+#
+#
 if [ ! -z "$ads_config1_enabled" ]; then
     echo "Add Window Active Director Configuration 1"
     dockerRunCommand="$dockerRunCommand 
--- a/prod/training.yml	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/training.yml	Tue Jul 01 20:51:22 2025 +0100
@@ -7,7 +7,7 @@
 services:
   usasdb:
     restart: unless-stopped
-    image: docker.ssdt.io/trainingdb-usas:${USAS_DB_TAG:-prod}
+    image: docker.ssdt-ohio.org/trainingdb-usas:${USAS_DB_TAG:-prod}
     networks:
       - default
     environment:
@@ -16,7 +16,7 @@
       - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
   usasapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usas-app:${USAS_TAG:-prod}
+    image: docker.ssdt-ohio.org/usas-app:${USAS_TAG:-prod}
     depends_on:
       - usasdb
     networks:
@@ -43,7 +43,7 @@
       - JAVA_OPTS=-Xmx840m 
   uspsdb:
     restart: unless-stopped
-    image: docker.ssdt.io/trainingdb-usps:${USPS_DB_TAG:-prod}
+    image: docker.ssdt-ohio.org/trainingdb-usps:${USPS_DB_TAG:-prod}
     networks:
       - default
     environment:
@@ -52,7 +52,7 @@
       - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
   uspsapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usps-app:${USPS_TAG:-prod}
+    image: docker.ssdt-ohio.org/usps-app:${USPS_TAG:-prod}
     depends_on:
       - uspsdb
     networks:
--- a/prod/update-ess-app.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/update-ess-app.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -79,6 +79,19 @@
 fi
 #
 #
+if [ ! -z "$miniOrangeEnabled" ]; then
+    echo "Adding MiniOrange Configuration"
+    dockerRunCommand="$dockerRunCommand
+        -e MINI_ORANGE_ENABLED=$miniOrangeEnabled
+        -e MINI_ORANGE_CLIENT_ID=$miniOrangeClientId
+        -e MINI_ORANGE_CLIENT_SECRET=$miniOrangeClientSecret
+        -e MINI_ORANGE_API_HOSTNAME=$miniOrangeApiHostname
+        -e MINI_ORANGE_FAIL_OPEN=$miniOrangeFailOpen
+        -e MINI_ORANGE_APP_HOST=$miniOrangeEssHost
+        -e MINI_ORANGE_MINUTES_UNTIL_EXPIRATION=$miniOrangeMinutesUntilExpiration"
+fi
+#
+#
 if [ ! -z "$ads_config1_enabled" ]; then
     echo "Add Window Active Director Configuration 1"
     dockerRunCommand="$dockerRunCommand
@@ -112,6 +125,13 @@
 fi
 #
 #
+support_instance=${support_instance:-false}
+if [ "$support_instance" = "true" ]; then
+    echo "Setting application instance type to Support"
+    dockerRunCommand="$dockerRunCommand -e APPLICATION_INSTANCE_TYPE=Support"
+fi
+#
+#
 dockerRunCommand="$dockerRunCommand -d $artifactUrl/ess-app:$appVersion"
 #
 # Execute constructed docker run command to create $entityId-ess-app container connected to db and docker network
--- a/prod/update-inventory-app.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/update-inventory-app.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -56,6 +56,13 @@
     dockerRunCommand="$dockerRunCommand -e DUO_USXS_HOST=$duo_usxs_host -e DUO_USXS_PORT=$duo_usxs_port -e DUO_USXS_CONTEXT=$duo_usxs_context -e DUO_MINUTES_UNTIL_EXPIRATION=$duo_minutes_until_expiration "
 fi
 #
+#
+if [ ! -z "$miniOrangeEnabled" ]; then
+    echo "Adding MiniOrange Configuration"
+    dockerRunCommand="$dockerRunCommand -e MINI_ORANGE_ENABLED=$miniOrangeEnabled -e MINI_ORANGE_CLIENT_ID=$miniOrangeClientId -e MINI_ORANGE_CLIENT_SECRET=$miniOrangeClientSecret -e MINI_ORANGE_API_HOSTNAME=$miniOrangeApiHostname "
+    dockerRunCommand="$dockerRunCommand -e MINI_ORANGE_FAIL_OPEN=$miniOrangeFailOpen -e MINI_ORANGE_APP_HOST=$miniOrangeEssHost -e MINI_ORANGE_MINUTES_UNTIL_EXPIRATION=$miniOrangeMinutesUntilExpiration "
+fi
+#
 dockerRunCommand="$dockerRunCommand -d $artifactUrl/inventory-app:$appVersion"
 #
 # Execute constructed docker run command to create $entityId-inventory-app container connected to db and docker network
--- a/prod/update-itcm-app.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/update-itcm-app.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -71,6 +71,19 @@
 fi
 #
 #
+if [ ! -z "$miniOrangeEnabled" ]; then
+    echo "Adding MiniOrange Configuration"
+    dockerRunCommand="$dockerRunCommand
+        -e MINI_ORANGE_ENABLED=$miniOrangeEnabled
+        -e MINI_ORANGE_CLIENT_ID=$miniOrangeClientId
+        -e MINI_ORANGE_CLIENT_SECRET=$miniOrangeClientSecret
+        -e MINI_ORANGE_API_HOSTNAME=$miniOrangeApiHostname
+        -e MINI_ORANGE_FAIL_OPEN=$miniOrangeFailOpen
+        -e MINI_ORANGE_APP_HOST=$miniOrangeEssHost
+        -e MINI_ORANGE_MINUTES_UNTIL_EXPIRATION=$miniOrangeMinutesUntilExpiration"
+fi
+#
+#
 if [ ! -z "$ads_config1_enabled" ]; then
     echo "Add Window Active Director Configuration 1"
     dockerRunCommand="$dockerRunCommand 
--- a/prod/usas-services.yml	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/usas-services.yml	Tue Jul 01 20:51:22 2025 +0100
@@ -1,6 +1,6 @@
   usasdb:
     restart: unless-stopped
-    image: docker.ssdt.io/ssdt-postgres:5
+    image: docker.ssdt-ohio.org/ssdt-postgres:5
     volumes:
       - usasdata:/var/lib/postgresql/data
     networks:
@@ -11,7 +11,7 @@
       - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
   usasapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usas-app:${USAS_TAG:-prod}
+    image: docker.ssdt-ohio.org/usas-app:${USAS_TAG:-prod}
     depends_on:
       - usasdb
     networks:
--- a/prod/usps-services.yml	Tue Jul 01 20:50:56 2025 +0100
+++ b/prod/usps-services.yml	Tue Jul 01 20:51:22 2025 +0100
@@ -1,6 +1,6 @@
   uspsdb:
     restart: unless-stopped
-    image: docker.ssdt.io/ssdt-postgres:5
+    image: docker.ssdt-ohio.org/ssdt-postgres:5
     volumes:
       - uspsdata:/var/lib/postgresql/data
     networks:
@@ -11,7 +11,7 @@
       - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
   uspsapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usps-app:${USPS_TAG:-prod}
+    image: docker.ssdt-ohio.org/usps-app:${USPS_TAG:-prod}
     depends_on:
       - uspsdb
     networks:
--- a/scripts/backup-container-docker.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/backup-container-docker.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Executes a database backup for the specifed database container.  
+# Executes a database backup for the specified database container.
 # The current directory is expected to contain a project configured
 # as with SSDT conventions for an application database.
 #
@@ -64,7 +64,15 @@
    }
    entityId=$(prop 'entityId' | tr -d '"')
    containerName="$entityId-ess-db"
-   backupFile=./backup/${entityId}-ess-db.$(date +%Y-%m-%d-%H-%M-%S).backup
+   IRN=$(docker exec $containerName psql --username=postgres --dbname=$container -t -c 'select irn from organization')
+   ## if database is empty, it will put IRN 000000
+   if [ "$IRN" == "" ]; then
+     echo "no IRN set, using 000000"
+     IRN=000000
+   fi
+   ##Take out the extra space from IRN returned from db.
+   IRN=`echo $IRN | sed -e 's/^[[:space:]]*//'`
+   backupFile=./backup/${IRN}${entityId}-ess-db.$(date +%Y-%m-%d-%H-%M-%S).backup
    echo "entityId is $entityId"
    echo "container name is $containerName"
 fi
--- a/scripts/backup-ess.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/backup-ess.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 
 source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
 
--- a/scripts/backup-itcm.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/backup-itcm.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/bin/bash 
 
 source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
 
-${SSDT_SCRIPTS}/backup-container-docker.sh itcmdb ${1}
\ No newline at end of file
+${SSDT_SCRIPTS}/backup-container-docker.sh itcmdb ${1}
--- a/scripts/console.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/console.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -17,9 +17,9 @@
 
 if [ "$project" == "" ]
 then 
-  docker run -it -v ${PWD}:/tmp  -v ${SSDT_HOME}:/ssdt --rm docker.ssdt.io/ssdt-utils telnet $ip 2000 | tee console.log
+  docker run -it -v ${PWD}:/tmp  -v ${SSDT_HOME}:/ssdt --rm docker.ssdt-ohio.org/ssdt-utils telnet $ip 2000 | tee console.log
 else
   echo "connecting to telnet console on ${container} in ${project}"
-  docker run -it --network ${project}_default --rm docker.ssdt.io/ssdt-utils telnet $ip 2000 | tee console.log
+  docker run -it --network ${project}_default --rm docker.ssdt-ohio.org/ssdt-utils telnet $ip 2000 | tee console.log
 fi
 
--- a/scripts/exec-all-projects-docker.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/exec-all-projects-docker.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -2,7 +2,7 @@
 # Scans for standard SSDT docker projects in specified parent path and
 # executes the specified command.
 #
-# The first parameter specifices the parent directory to search for. 
+# The first parameter specifies the parent directory to search for.
 # 
 # The second parameter specifies the command to execute against each
 # SSDT standard docker project found under the parent directory.
@@ -30,9 +30,9 @@
    projectdir=`dirname $f`
    project=`basename $projectdir`
    cd $projectdir
-   if ls .env/ssdt-*-shared.properties 1> /dev/null 2>&1; then
+   if ls .env/*-shared.properties 1> /dev/null 2>&1; then
       echo "projectdir is $projectdir"
-      echo -e "----\n$executing $COMMAND on $project \n----"      
+      echo -e "----\n$executing $COMMAND on $project \n----"
 
       bash -c "${COMMAND}"
       echo ""
--- a/scripts/metrics.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/metrics.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -10,5 +10,5 @@
 ip=$(docker inspect -f "{{with  .NetworkSettings.Networks}}{{.${project}_default.IPAddress}}{{end}}" $container)
 
 echo "connecting to ${container} in ${project} at ${ip}:8080"
-docker run  --network ${project}_default --rm docker.ssdt.io/ssdt-utils curl -s http://${ip}:8080/metrics/admin/metrics?pretty=true
-docker run  --network ${project}_default --rm docker.ssdt.io/ssdt-utils curl -s http://${ip}:8080/metrics/admin/threads
+docker run  --network ${project}_default --rm docker.ssdt-ohio.org/ssdt-utils curl -s http://${ip}:8080/metrics/admin/metrics?pretty=true
+docker run  --network ${project}_default --rm docker.ssdt-ohio.org/ssdt-utils curl -s http://${ip}:8080/metrics/admin/threads
--- a/scripts/restore-ess.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/restore-ess.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 
 source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
 
--- a/scripts/restore-itcm.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/restore-itcm.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 
 source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
 
--- a/scripts/send.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/send.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -15,5 +15,5 @@
 name=${2:-$(basename $PWD)}
 source=$(hostname)
 
-docker run -i -v $SSDT_HOME:/ssdt -v ${PWD}:/tmp --rm docker.ssdt.io/ssdt-utils \
-   curl -F source=$source -F name=$name -F file=@$file https://upload.ssdt.io/upload
\ No newline at end of file
+docker run -i -v $SSDT_HOME:/ssdt -v ${PWD}:/tmp --rm docker.ssdt-ohio.org/ssdt-utils \
+   curl -F source=$source -F name=$name -F file=@$file https://upload.ssdt-ohio.org/upload
--- a/scripts/updates-pull.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/scripts/updates-pull.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -20,7 +20,7 @@
 do
    repo=${line[0]}
    tag=${line[1]}
-   if [[ $repo == docker.ssdt.io* && $tag != *none* ]]
+   if [[ $repo == docker.ssdt-ohio.org* && $tag != *none* ]]
    then
       echo "docker pull ${repo}:${tag}"
       docker pull ${repo}:${tag}
--- a/testbench-node-17/Dockerfile	Tue Jul 01 20:50:56 2025 +0100
+++ b/testbench-node-17/Dockerfile	Tue Jul 01 20:51:22 2025 +0100
@@ -7,7 +7,7 @@
 # Install PhantomJS
 RUN mkdir /phantom
 WORKDIR /phantom
-ADD http://files.ssdt.io/phantomjs-2.1.1-linux-x86_64.tar /phantom/phantomjs.tar
+ADD http://files.ssdt-ohio.org/phantomjs-2.1.1-linux-x86_64.tar /phantom/phantomjs.tar
 RUN 	tar -xf phantomjs.tar \
 		&& 	mv $(find /phantom -name phantomjs) /bin \
 		&& rm -rf /phantom
--- a/testbench-node/Dockerfile	Tue Jul 01 20:50:56 2025 +0100
+++ b/testbench-node/Dockerfile	Tue Jul 01 20:51:22 2025 +0100
@@ -7,7 +7,7 @@
 # Install PhantomJS
 RUN mkdir /phantom
 WORKDIR /phantom
-ADD http://files.ssdt.io/phantomjs-2.1.1-linux-x86_64.tar /phantom/phantomjs.tar
+ADD http://files.ssdt-ohio.org/phantomjs-2.1.1-linux-x86_64.tar /phantom/phantomjs.tar
 RUN 	tar -xf phantomjs.tar \
 		&& 	mv $(find /phantom -name phantomjs) /bin \
 		&& rm -rf /phantom
--- a/tomcat-17/Dockerfile	Tue Jul 01 20:50:56 2025 +0100
+++ b/tomcat-17/Dockerfile	Tue Jul 01 20:51:22 2025 +0100
@@ -1,12 +1,11 @@
-FROM tomcat:8.5.93-jre17-temurin-jammy
+FROM tomcat:9.0.89-jdk17-temurin-jammy
 
 MAINTAINER Marc Davis <davis@ssdt-ohio.org>
 
 RUN apt-get update && apt-get install -y gnupg && apt-get install -y apt-transport-https \
     && gpg --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
     && gpg --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 871920D1991BC93C && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 112695A0E562B32A  \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA8E81B4331F7F50 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 0E98404D386FA1D9 EF0F382A1A7B6500
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 871920D1991BC93C 112695A0E562B32A AA8E81B4331F7F50 04EE7237B7D453EC 648ACFD622F3D138 0E98404D386FA1D9 EF0F382A1A7B6500
 
 RUN apt-get update && apt-get install -y x11-common
 
@@ -27,6 +26,7 @@
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
+
 WORKDIR /usr/local/tomcat
 
 COPY setenv.sh bin/
--- a/tomcat-17/setenv.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/tomcat-17/setenv.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -7,6 +7,7 @@
 export CATALINA_OPTS="$CATALINA_OPTS -Djava.security.egd=file:/dev/./urandom"
 export CATALINA_OPTS="$CATALINA_OPTS -Duser.language=en"
 export CATALINA_OPTS="$CATALINA_OPTS -Duser.region=US"
+export CATALINA_OPTS="$CATALINA_OPTS --add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"
 
 echo "Using CATALINA_OPTS $CATALINA_OPTS"
 echo "Using     JAVA_OPTS $JAVA_OPTS"
--- a/trainingdb-usas/Dockerfile	Tue Jul 01 20:50:56 2025 +0100
+++ b/trainingdb-usas/Dockerfile	Tue Jul 01 20:51:22 2025 +0100
@@ -1,7 +1,7 @@
 
-FROM docker-dev.ssdt.io/trainingdb
+FROM docker-dev.ssdt-ohio.org/trainingdb
 
-ADD http://files.ssdt.io/usas-training.backup.gz $BACKUP_FILE
+ADD http://files.ssdt-ohio.org/usas-training.backup.gz $BACKUP_FILE
 
 RUN chmod a+r $BACKUP_FILE
 
--- a/trainingdb-usps/Dockerfile	Tue Jul 01 20:50:56 2025 +0100
+++ b/trainingdb-usps/Dockerfile	Tue Jul 01 20:51:22 2025 +0100
@@ -1,7 +1,7 @@
 
-FROM docker-dev.ssdt.io/trainingdb
+FROM docker-dev.ssdt-ohio.org/trainingdb
 
-ADD http://files.ssdt.io/usps-training.backup.gz $BACKUP_FILE
+ADD http://files.ssdt-ohio.org/usps-training.backup.gz $BACKUP_FILE
 
 RUN chmod a+r $BACKUP_FILE
 
--- a/trainingdb/Dockerfile	Tue Jul 01 20:50:56 2025 +0100
+++ b/trainingdb/Dockerfile	Tue Jul 01 20:51:22 2025 +0100
@@ -1,5 +1,5 @@
 
-FROM docker.ssdt.io/ssdt-postgres:5
+FROM docker.ssdt-ohio.org/ssdt-postgres:5
 
 MAINTAINER Dave Smith smith@nwoca.org
 
--- a/update.sh	Tue Jul 01 20:50:56 2025 +0100
+++ b/update.sh	Tue Jul 01 20:51:22 2025 +0100
@@ -1,4 +1,4 @@
 #!/bin/bash
 SSDT_HOME="$( dirname "${BASH_SOURCE[0]}")"
-docker pull docker.ssdt.io/ssdt-utils
-docker run -t -v $SSDT_HOME:/ssdt --rm docker.ssdt.io/ssdt-utils update ${1}
+docker pull docker.ssdt-ohio.org/ssdt-utils
+docker run -t -v $SSDT_HOME:/ssdt --rm docker.ssdt-ohio.org/ssdt-utils update ${1}