# HG changeset patch
# User smith@nwoca.org
# Date 1515547358 0
# Node ID b390c30aa6c671e244fd7911405c3c3a687914be
# Parent  2ae65177f74e67ceda79364dd2ed9bb69b1905bb
DEP-14: update prod tags

diff -r 2ae65177f74e -r b390c30aa6c6 prod/import-usas.sh
--- a/prod/import-usas.sh	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/import-usas.sh	Wed Jan 10 01:22:38 2018 +0000
@@ -13,11 +13,11 @@
 [ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
 [ -f "docker-compose.usasimport.override.yml" ] && export OVERRIDE2=" -f docker-compose.usasimport.override.yml"
 #
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/pilot/import-usas.yml $OVERRIDE rm -f usasimport 
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport 
 # start import and wait for completion
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/pilot/import-usas.yml $OVERRIDE $OVERRIDE2 up usasimport | tee usasimport.log
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE $OVERRIDE2 up usasimport | tee usasimport.log
 # remove temporary container
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/pilot/import-usas.yml $OVERRIDE rm -f usasimport
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport
 # start application
 docker-compose up -d usasapp
 
diff -r 2ae65177f74e -r b390c30aa6c6 prod/import-usas.yml
--- a/prod/import-usas.yml	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/import-usas.yml	Wed Jan 10 01:22:38 2018 +0000
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   usasimport:
-    image: docker.ssdt.io/usas-import:${USAS_TAG:-pilot}
+    image: docker.ssdt.io/usas-import:${USAS_TAG:-prod}
     command: -i ${IMP_IRN- } -u ${IMP_URL- } -r ${IMP_PATH- }
     depends_on:
       - usasdb
diff -r 2ae65177f74e -r b390c30aa6c6 prod/import-usps.sh
--- a/prod/import-usps.sh	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/import-usps.sh	Wed Jan 10 01:22:38 2018 +0000
@@ -13,11 +13,12 @@
 export IMP_EM=${IMP_EM-}
 
 [ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
+[ -f "docker-compose.uspsimport.override.yml" ] && export OVERRIDE2=" -f docker-compose.uspsimport.override.yml"
 
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/pilot/import-usps.yml $OVERRIDE rm -f uspsimport
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usps.yml $OVERRIDE rm -f uspsimport
 # start import and wait for completion
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/pilot/import-usps.yml $OVERRIDE up uspsimport | tee uspsimport.log
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usps.yml $OVERRIDE $OVERRIDE2 up uspsimport | tee uspsimport.log
 # remove temporary container
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/pilot/import-usps.yml $OVERRIDE rm -f uspsimport
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usps.yml $OVERRIDE rm -f uspsimport
 # start application
 docker-compose up -d uspsapp
diff -r 2ae65177f74e -r b390c30aa6c6 prod/import-usps.yml
--- a/prod/import-usps.yml	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/import-usps.yml	Wed Jan 10 01:22:38 2018 +0000
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   uspsimport:
-    image: docker.ssdt.io/usps-import:${USPS_TAG:-pilot}
+    image: docker.ssdt.io/usps-import:${USPS_TAG:-prod}
     command: -i ${IMP_IRN- } -u ${IMP_URL- } -r ${IMP_PATH- } ${IMP_ANON- } ${IMP_EM- }
     depends_on:
       - uspsdb
diff -r 2ae65177f74e -r b390c30aa6c6 prod/nginx-override.yml
--- a/prod/nginx-override.yml	Wed Jan 10 00:44:05 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-version: "3.3"
-services:
-  usasapp:
-    networks:
-      - proxy
-    environment:
-      - APPLICATION_ADMIN_PASSWORD=test
-      - APPLICATION_ADMIN_RESET=true
-      - VIRTUAL_HOST=${COMPOSE_PROJECT_NAME}-usas.demo2.ssdt.io
-      - VIRTUAL_PORT=8080
-      - LETSENCRYPT_HOST=${COMPOSE_PROJECT_NAME}-usas.demo2.ssdt.io
-      - LETSENCRYPT_EMAIL=smith@nwoca.org
-      - JAVA_OPTS=-Xmx840m
-  uspsapp:
-    networks:
-      - proxy
-    environment:
-      - APPLICATION_ADMIN_PASSWORD=test
-      - APPLICATION_ADMIN_RESET=true
-      - VIRTUAL_HOST=${COMPOSE_PROJECT_NAME}-usps.demo2.ssdt.io
-      - VIRTUAL_PORT=8080
-      - LETSENCRYPT_HOST=${COMPOSE_PROJECT_NAME}-usps.demo2.ssdt.io
-      - LETSENCRYPT_EMAIL=smith@nwoca.org
-      - JAVA_OPTS=-Xmx840m
-networks:
-   proxy:
-     external:
-        name: proxy_default
-
diff -r 2ae65177f74e -r b390c30aa6c6 prod/training.sh
--- a/prod/training.sh	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/training.sh	Wed Jan 10 01:22:38 2018 +0000
@@ -3,14 +3,13 @@
 #
 # Usage:
 #
-#  /data/preview/training-01 $   /ssdt/compose2/preview/training.sh
+#  /data/preview/training-01 $   /ssdt/compose2/prod/training.sh
 #
 # Will create a docker-compose.yml and .env file with default settings using the SSDT 
 # supplied training database
 #
-# These are special database images which recreates the database each time the container is created.
-# Therefore, it is very easy to reset the training database simply by deleting the
-# project containers and restarting them. for example:
+# 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:
 #     
 #    docker-compose down
 #    docker-compose up -d
diff -r 2ae65177f74e -r b390c30aa6c6 prod/training.yml
--- a/prod/training.yml	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/training.yml	Wed Jan 10 01:22:38 2018 +0000
@@ -1,10 +1,13 @@
-# **** DO NOT MODIFY THIS FILE. ****"
-# Place customizations in docker-compose.override.yml and .env
+# ****************************************************************
+# *                DO NOT MODIFY THIS FILE.                      *
+# *                                                              *
+# * Place customizations in docker-compose.override.yml and .env *
+# ****************************************************************
 version: "3.3"
 services:
   usasdb:
     restart: unless-stopped
-    image: docker.ssdt.io/trainingdb-usas:pilot
+    image: docker.ssdt.io/trainingdb-usas:${USAS_DB_TAG:-prod}
     networks:
       - default
     environment:
@@ -13,7 +16,7 @@
       - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
   usasapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usas-app:${USAS_TAG:-pilot}
+    image: docker.ssdt.io/usas-app:${USAS_TAG:-prod}
     depends_on:
       - usasdb
     networks:
@@ -39,7 +42,7 @@
       - JAVA_OPTS=-Xmx840m 
   uspsdb:
     restart: unless-stopped
-    image: docker.ssdt.io/trainingdb-usps:pilot
+    image: docker.ssdt.io/trainingdb-usps:${USPS_DB_TAG:-prod}
     networks:
       - default
     environment:
@@ -48,7 +51,7 @@
       - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
   uspsapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usps-app:${USPS_TAG:-pilot}
+    image: docker.ssdt.io/usps-app:${USPS_TAG:-prod}
     depends_on:
       - uspsdb
     networks:
diff -r 2ae65177f74e -r b390c30aa6c6 prod/usas-services.yml
--- a/prod/usas-services.yml	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/usas-services.yml	Wed Jan 10 01:22:38 2018 +0000
@@ -11,7 +11,7 @@
       - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
   usasapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usas-app:${USAS_TAG:-pilot}
+    image: docker.ssdt.io/usas-app:${USAS_TAG:-prod}
     depends_on:
       - usasdb
     networks:
diff -r 2ae65177f74e -r b390c30aa6c6 prod/usps-services.yml
--- a/prod/usps-services.yml	Wed Jan 10 00:44:05 2018 +0000
+++ b/prod/usps-services.yml	Wed Jan 10 01:22:38 2018 +0000
@@ -11,7 +11,7 @@
       - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
   uspsapp:
     restart: unless-stopped
-    image: docker.ssdt.io/usps-app:${USPS_TAG:-pilot}
+    image: docker.ssdt.io/usps-app:${USPS_TAG:-prod}
     depends_on:
       - uspsdb
     networks: