# HG changeset patch
# User smith@nwoca.org
# Date 1515548563 0
# Node ID 84c830c42d557936e46a15573d2a8e427a5e7b4f
# Parent  b390c30aa6c671e244fd7911405c3c3a687914be# Parent  0e0f7fc084fb5f38e611235a2c1a8535300d07fe
flow: Merged <release> 'v2.0.0' to <develop> ('default').

diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/import-usas.yml
--- a/compose/preview/import-usas.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-usasimport:
-  image: docker.ssdt.io/usas-import:preview
-  entrypoint: 
-    - java
-    - -Xmx1600m
-    - -XX:MaxMetaspaceSize=256m
-    - -jar
-    - /opt/import/usas-import.jar
-  command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH}
-  links:
-    - usasdb:database
-  environment:
-    - DB_POOL_LEAKDETECTIONTHRESHOLD=0
-    - DB_HOST=database
-    - DB_NAME=$${DATABASE_ENV_DB_NAME}
-    - DB_USER=$${DATABASE_ENV_DB_USER}
-    - DB_PASS=$${DATABASE_ENV_DB_PASS}
diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/import-usps.yml
--- a/compose/preview/import-usps.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-uspsimport:
-  image: docker.ssdt.io/usps-import:preview
-  command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
-  links:
-    - uspsdb:database
-  environment:
-    - DB_POOL_LEAKDETECTIONTHRESHOLD=0
-    - DB_HOST=database
-    - DB_NAME=$${DATABASE_ENV_DB_NAME}
-    - DB_USER=$${DATABASE_ENV_DB_USER}
-    - DB_PASS=$${DATABASE_ENV_DB_PASS}
diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/import.yml
--- a/compose/preview/import.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-uspsimport:
-  image: docker.ssdt.io/usps-import:preview
-  command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
-  links:
-    - uspsdb:database
-  environment:
-    - DB_HOST=database
-    - DB_NAME=$${DATABASE_ENV_DB_NAME}
-    - DB_USER=$${DATABASE_ENV_DB_USER}
-    - DB_PASS=$${DATABASE_ENV_DB_PASS}
-usasimport:
-  image: docker.ssdt.io/usas-import:preview
-  command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
-  links:
-    - usasdb:database
-  environment:
-    - DB_HOST=database
-    - DB_NAME=$${DATABASE_ENV_DB_NAME}
-    - DB_USER=$${DATABASE_ENV_DB_USER}
-    - DB_PASS=$${DATABASE_ENV_DB_PASS}
diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/training.yml
--- a/compose/preview/training.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-usasdb:
-  restart: unless-stopped
-  image: docker.ssdt.io/trainingdb-usas
-  environment:
-    - DB_NAME=usasdb
-    - DB_USER=usas
-    - DB_PASS=usasdefault
-usasapp:
-  restart: unless-stopped
-  image: docker.ssdt.io/usas-app:preview
-  volumes:
-    - ${PWD}/config:/config
-  environment:
-    - DB_HOST=usas-database
-    - DB_NAME=usasdb
-    - DB_USER=usas
-    - DB_PASS=usasdefault
-    - JAVA_OPTS=-Xmx640m
-  links:
-    - usasdb:usas-database
-uspsdb:
-  restart: unless-stopped
-  image: docker.ssdt.io/trainingdb-usps
-  environment:
-    - DB_NAME=uspsdb
-    - DB_USER=usps
-    - DB_PASS=uspsdefault
-uspsapp:
-  restart: unless-stopped
-  image: docker.ssdt.io/usps-app:preview
-  volumes:
-    - ${PWD}/config:/config
-  environment:
-    - DB_HOST=usps-database
-    - DB_NAME=uspsdb
-    - DB_USER=usps
-    - DB_PASS=uspsdefault
-    - JAVA_OPTS=-Xmx640m
-  links:
-    - uspsdb:usps-database
-
diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/usas.template.yml
--- a/compose/preview/usas.template.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-usasdb:
-  extends:
-    file: /ssdt/compose/preview/usas.yml
-    service: usasdb
-  volumes:
-    - |volumeName|:/var/lib/postgresql/data
-usasapp:
-  extends:
-     file: /ssdt/compose/preview/usas.yml
-     service: usasapp
-  links:
-    - usasdb:database
diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/usas.yml
--- a/compose/preview/usas.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# base compose file for USAS preview release
-usasdb:
-  restart: unless-stopped
-  image: docker.ssdt.io/ssdt-postgres:3
-  volumes:
-    - ${PWD}/backup:/backup
-  environment:
-    - DB_NAME=usasdb
-    - DB_USER=usas
-    - DB_PASS=usasdefault
-usasapp:
-  restart: unless-stopped
-  image: docker.ssdt.io/usas-app:preview
-  volumes:
-    - ${PWD}/config:/config
-  environment:
-    - DB_HOST=database
-    - DB_NAME=usasdb
-    - DB_USER=usas
-    - DB_PASS=usasdefault
diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/usps.template.yml
--- a/compose/preview/usps.template.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-uspsdb:
-  extends:
-    file: /ssdt/compose/preview/usps.yml
-    service: uspsdb
-  volumes:
-    - |volumeName|:/var/lib/postgresql/data
-uspsapp:
-  extends:
-     file: /ssdt/compose/preview/usps.yml
-     service: uspsapp
-  links:
-    - uspsdb:database
diff -r b390c30aa6c6 -r 84c830c42d55 compose/preview/usps.yml
--- a/compose/preview/usps.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# base compose file for usps preview release
-uspsdb:
-  restart: unless-stopped
-  image: docker.ssdt.io/ssdt-postgres:3
-  volumes:
-    - ${PWD}/backup:/backup
-  environment:
-    - DB_NAME=uspsdb
-    - DB_USER=usps
-    - DB_PASS=uspsdefault
-uspsapp:
-  restart: unless-stopped
-  image: docker.ssdt.io/usps-app:preview
-  volumes:
-    - ${PWD}/config:/config
-  environment:
-    - DB_HOST=database
-    - DB_NAME=uspsdb
-    - DB_USER=usps
-    - DB_PASS=uspsdefault
diff -r b390c30aa6c6 -r 84c830c42d55 compose/sample/docker-compose.yml
--- a/compose/sample/docker-compose.yml	Wed Jan 10 01:22:38 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-data:
-  image: busybox
-  volumes:
-    - ${PWD}/dbdata:/var/lib/postgresql/data
-    - ${PWD}/config:/config
-    - ${PWD}/backup:/backup
-db:
-  restart: always
-  image: djsmith/ssdt-postgres:1
-  volumes_from:
-    - data
-  environment:
-    - DB_NAME=usasdb
-    - DB_USER=usas
-    - DB_PASS=PleaseDontUseExamplePasswords
-app:
-  restart: always
-  image: djsmith/usas-app:snapshot
-  volumes_from:
-    - data
-  ports:
-    - "18004:8080"
-  links:
-    - db:database
-  environment:
-    - DB_HOST=database
-    - DB_NAME=$${DATABASE_ENV_DB_NAME}
-    - DB_USER=$${DATABASE_ENV_DB_USER}
-    - DB_PASS=$${DATABASE_ENV_DB_PASS}
-
diff -r b390c30aa6c6 -r 84c830c42d55 prod/training.sh
--- a/prod/training.sh	Wed Jan 10 01:22:38 2018 +0000
+++ b/prod/training.sh	Wed Jan 10 01:42:43 2018 +0000
@@ -9,7 +9,8 @@
 # supplied training database
 #
 # These are special database images which recreates the database each time the container is started.
-# Therefore, it is very easy to reset the training database simply by restarting the containers. for example:
+# Therefore, it is very easy to reset the training database simply deleting and restarting the containers. 
+# For example:
 #     
 #    docker-compose down
 #    docker-compose up -d
diff -r b390c30aa6c6 -r 84c830c42d55 scripts/exec-all-projects.sh
--- a/scripts/exec-all-projects.sh	Wed Jan 10 01:22:38 2018 +0000
+++ b/scripts/exec-all-projects.sh	Wed Jan 10 01:42:43 2018 +0000
@@ -10,20 +10,19 @@
 #
 # examples:
 #
-#   /ssdt/scripts/exec-all-projects.sh /data/pilot docker-compose ps
+#   /ssdt/scripts/exec-all-projects.sh /data/prod docker-compose ps
 # 
-#     executes "docker-compose ps" against all projects under /data/pilot
+#     executes "docker-compose ps" against all projects under /data/prod
 #
-#   /ssdt/scripts/exec-all-projects.sh /data/pilot /ssdt/ /ssdt/scripts/backup-usas.sh
+#   /ssdt/scripts/exec-all-projects.sh /data/prod /ssdt/ /ssdt/scripts/backup-usas.sh
 #
-#     runs backup-usas.sh script against all projects under /data/pilot
-#
-#   /ssdt/scripts/exec-all-projects.sh /data/pilot "/ssdt/scripts/capture.sh | /ssdt/scripts/send.sh -"
+#     runs backup-usas.sh script against all projects under /data/prod
 #
-#       captures the log files from all containers and sends one long file per project 
+#   /ssdt/scripts/exec-all-projects.sh /data/prod "/ssdt/scripts/capture.sh | /ssdt/scripts/send.sh -"
+#
+#       captures the log files from all containers and sends one log file per project 
 #       to the SSDT support server.
 #
-#
 ##
 
 source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"