# HG changeset patch # User Marc Davis # Date 1725464201 14400 # Node ID 9afc8cb478f6d0f2882f3de596d36f2e2b62257a # Parent 5c9d90a1673a4e37cd7dc000ccf6d1e83b668c86 Domain changed from ssdt.io to ssdt-ohio.org diff -r 5c9d90a1673a -r 9afc8cb478f6 init.sh --- a/init.sh Wed Jul 17 13:22:44 2024 -0400 +++ b/init.sh Wed Sep 04 11:36:41 2024 -0400 @@ -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' diff -r 5c9d90a1673a -r 9afc8cb478f6 prod/import-usas.yml --- a/prod/import-usas.yml Wed Jul 17 13:22:44 2024 -0400 +++ b/prod/import-usas.yml Wed Sep 04 11:36:41 2024 -0400 @@ -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} diff -r 5c9d90a1673a -r 9afc8cb478f6 prod/import-usps.yml --- a/prod/import-usps.yml Wed Jul 17 13:22:44 2024 -0400 +++ b/prod/import-usps.yml Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 prod/training.yml --- a/prod/training.yml Wed Jul 17 13:22:44 2024 -0400 +++ b/prod/training.yml Wed Sep 04 11:36:41 2024 -0400 @@ -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: diff -r 5c9d90a1673a -r 9afc8cb478f6 prod/usas-services.yml --- a/prod/usas-services.yml Wed Jul 17 13:22:44 2024 -0400 +++ b/prod/usas-services.yml Wed Sep 04 11:36:41 2024 -0400 @@ -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: diff -r 5c9d90a1673a -r 9afc8cb478f6 prod/usps-services.yml --- a/prod/usps-services.yml Wed Jul 17 13:22:44 2024 -0400 +++ b/prod/usps-services.yml Wed Sep 04 11:36:41 2024 -0400 @@ -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: diff -r 5c9d90a1673a -r 9afc8cb478f6 scripts/console.sh --- a/scripts/console.sh Wed Jul 17 13:22:44 2024 -0400 +++ b/scripts/console.sh Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 scripts/metrics.sh --- a/scripts/metrics.sh Wed Jul 17 13:22:44 2024 -0400 +++ b/scripts/metrics.sh Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 scripts/send.sh --- a/scripts/send.sh Wed Jul 17 13:22:44 2024 -0400 +++ b/scripts/send.sh Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 scripts/updates-pull.sh --- a/scripts/updates-pull.sh Wed Jul 17 13:22:44 2024 -0400 +++ b/scripts/updates-pull.sh Wed Sep 04 11:36:41 2024 -0400 @@ -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} diff -r 5c9d90a1673a -r 9afc8cb478f6 testbench-node-17/Dockerfile --- a/testbench-node-17/Dockerfile Wed Jul 17 13:22:44 2024 -0400 +++ b/testbench-node-17/Dockerfile Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 testbench-node/Dockerfile --- a/testbench-node/Dockerfile Wed Jul 17 13:22:44 2024 -0400 +++ b/testbench-node/Dockerfile Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 trainingdb-usas/Dockerfile --- a/trainingdb-usas/Dockerfile Wed Jul 17 13:22:44 2024 -0400 +++ b/trainingdb-usas/Dockerfile Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 trainingdb-usps/Dockerfile --- a/trainingdb-usps/Dockerfile Wed Jul 17 13:22:44 2024 -0400 +++ b/trainingdb-usps/Dockerfile Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 trainingdb/Dockerfile --- a/trainingdb/Dockerfile Wed Jul 17 13:22:44 2024 -0400 +++ b/trainingdb/Dockerfile Wed Sep 04 11:36:41 2024 -0400 @@ -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 diff -r 5c9d90a1673a -r 9afc8cb478f6 update.sh --- a/update.sh Wed Jul 17 13:22:44 2024 -0400 +++ b/update.sh Wed Sep 04 11:36:41 2024 -0400 @@ -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}