# HG changeset patch
# User smith@nwoca.org
# Date 1494085508 -3600
# Node ID 4875af3f3383e392b7d9a106891c91a61b8a2289
# Parent  cf5348287cf684597f64f53e48c0a5906be6fa27
DEP-12: move to compose v2

diff -r cf5348287cf6 -r 4875af3f3383 compose2/preview/import-usas.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/import-usas.yml	Sat May 06 16:45:08 2017 +0100
@@ -0,0 +1,6 @@
+version: "2.1"
+services:
+  usasimport:
+    extends:
+     file: /ssdt/compose2/preview/usxs-services.yml
+     service: usasimport-base
diff -r cf5348287cf6 -r 4875af3f3383 compose2/preview/import-usps.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/import-usps.yml	Sat May 06 16:45:08 2017 +0100
@@ -0,0 +1,6 @@
+version: "2.1"
+services:
+  uspsimport:
+    extends:
+     file: /ssdt/compose2/preview/usxs-services.yml
+     service: uspsimport-base
diff -r cf5348287cf6 -r 4875af3f3383 compose2/preview/training.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/training.yml	Sat May 06 16:45:08 2017 +0100
@@ -0,0 +1,34 @@
+version: "2.1"
+services:
+  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
+    environment:
+      - DB_HOST=usasdb
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=usasdefault
+      - JAVA_OPTS=-Xmx640m
+  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
+    environment:
+      - DB_HOST=uspsdb
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=uspsdefault
+      - JAVA_OPTS=-Xmx640m
diff -r cf5348287cf6 -r 4875af3f3383 compose2/preview/usas-template.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/usas-template.yml	Sat May 06 16:45:08 2017 +0100
@@ -0,0 +1,12 @@
+version: "2.1"
+services:
+  usasdb:
+    extends:
+      file: /ssdt/compose2/preview/usxs-services.yml
+      service: usasdb-base
+  usasapp:
+    extends:
+      file: /ssdt/compose2/preview/usas-services.yml
+      service: usasapp-base
+    depends_on:
+      - usasdb
diff -r cf5348287cf6 -r 4875af3f3383 compose2/preview/usps-template.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/usps-template.yml	Sat May 06 16:45:08 2017 +0100
@@ -0,0 +1,12 @@
+version: "2.1"
+services:
+  uspsdb:
+    extends:
+      file: /ssdt/compose2/preview/usxs-services.yml
+      service: uspsdb-base
+  uspsapp:
+    extends:
+       file: /ssdt/compose2/preview/usxs-services.yml
+       service: uspsapp-base
+    depends_on:
+      - uspsdb
diff -r cf5348287cf6 -r 4875af3f3383 compose2/preview/usxs-services.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/usxs-services.yml	Sat May 06 16:45:08 2017 +0100
@@ -0,0 +1,64 @@
+# base compose file for USxS Preview releases
+version: "2.1"
+services:
+  usasdb-base:
+    restart: unless-stopped
+    image: docker.ssdt.io/ssdt-postgres:3
+    volumes:
+      - usasdata:/var/lib/postgresql/data
+    environment:
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
+  usasapp-base:
+    restart: unless-stopped
+    image: docker.ssdt.io/usas-app:preview
+    environment:
+      - DB_HOST=usasdb
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTHOST=uspsapp
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTDNSLOOKUP=true
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=0.0.0.0
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTDNSLOOKUP=false
+  usasimport-base:
+    image: docker.ssdt.io/usas-import:preview
+    command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH}
+    environment:
+      - DB_HOST=usasdb
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
+  uspsdb-base:
+    restart: unless-stopped
+    image: docker.ssdt.io/ssdt-postgres:3
+    volumes:
+      - uspsdata:/var/lib/postgresql/data
+    environment:
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
+  uspsapp-base:
+    restart: unless-stopped
+    image: docker.ssdt.io/usps-app:preview
+    environment:
+      - DB_HOST=uspsdb
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=usasapp
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=true
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=0.0.0.0
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=false
+  uspsimport-base:
+    image: docker.ssdt.io/usps-import:preview
+    command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
+    environment:
+      - DB_HOST=uspsdb
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}            
+volumes:
+   usasdata:
+   uspsdata:
\ No newline at end of file
diff -r cf5348287cf6 -r 4875af3f3383 compose3/preview/import-usas.yml
--- a/compose3/preview/import-usas.yml	Sat May 06 16:27:43 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-version: "2.1"
-services:
-  usasimport:
-    extends:
-     file: /ssdt/compose3/preview/usxs-services.yml
-     service: usasimport
diff -r cf5348287cf6 -r 4875af3f3383 compose3/preview/import-usps.yml
--- a/compose3/preview/import-usps.yml	Sat May 06 16:27:43 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-version: "2.1"
-services:
-  uspsimport:
-    extends:
-     file: /ssdt/compose3/preview/usxs-services.yml
-     service: uspsimport
diff -r cf5348287cf6 -r 4875af3f3383 compose3/preview/training.yml
--- a/compose3/preview/training.yml	Sat May 06 16:27:43 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-version: "2.1"
-services:
-  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
-    environment:
-      - DB_HOST=usasdb
-      - DB_NAME=usasdb
-      - DB_USER=usas
-      - DB_PASS=usasdefault
-      - JAVA_OPTS=-Xmx640m
-  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
-    environment:
-      - DB_HOST=uspsdb
-      - DB_NAME=uspsdb
-      - DB_USER=usps
-      - DB_PASS=uspsdefault
-      - JAVA_OPTS=-Xmx640m
diff -r cf5348287cf6 -r 4875af3f3383 compose3/preview/usas-template.yml
--- a/compose3/preview/usas-template.yml	Sat May 06 16:27:43 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-version: "2.1"
-services:
-  usasdb:
-    extends:
-      file: /ssdt/compose3/preview/usxs-services.yml
-      service: usasdb
-  usasapp:
-    extends:
-       file: /ssdt/compose3/preview/usas-services.yml
-       service: usasapp
-    depends_on:
-      - usasdb
diff -r cf5348287cf6 -r 4875af3f3383 compose3/preview/usps-template.yml
--- a/compose3/preview/usps-template.yml	Sat May 06 16:27:43 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-version: "2.1"
-services:
-  uspsdb:
-    extends:
-      file: /ssdt/compose3/preview/usxs-services.yml
-      service: uspsdb
-  uspsapp:
-    extends:
-       file: /ssdt/compose3/preview/usxs-services.yml
-       service: uspsapp
-    depends_on:
-      - uspsdb
diff -r cf5348287cf6 -r 4875af3f3383 compose3/preview/usxs-services.yml
--- a/compose3/preview/usxs-services.yml	Sat May 06 16:27:43 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-# base compose file for USxS Preview releases
-version: "2.1"
-services:
-  usasdb:
-    restart: unless-stopped
-    image: docker.ssdt.io/ssdt-postgres:3
-    volumes:
-      - usasdata:/var/lib/postgresql/data
-    environment:
-      - DB_NAME=usasdb
-      - DB_USER=usas
-      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
-  usasapp:
-    restart: unless-stopped
-    image: docker.ssdt.io/usas-app:preview
-    environment:
-      - DB_HOST=usasdb
-      - DB_NAME=usasdb
-      - DB_USER=usas
-      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
-      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTHOST=uspsapp
-      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTDNSLOOKUP=true
-      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=0.0.0.0
-      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTDNSLOOKUP=false
-  usasimport:
-    image: docker.ssdt.io/usas-import:preview
-    command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH}
-    environment:
-      - DB_HOST=usasdb
-      - DB_NAME=usasdb
-      - DB_USER=usas
-      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
-  uspsdb:
-    restart: unless-stopped
-    image: docker.ssdt.io/ssdt-postgres:3
-    volumes:
-      - uspsdata:/var/lib/postgresql/data
-    environment:
-      - DB_NAME=uspsdb
-      - DB_USER=usps
-      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
-  uspsapp:
-    restart: unless-stopped
-    image: docker.ssdt.io/usps-app:preview
-    environment:
-      - DB_HOST=uspsdb
-      - DB_NAME=uspsdb
-      - DB_USER=usps
-      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=usasapp
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=true
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=0.0.0.0
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=false
-  uspsimport:
-    image: docker.ssdt.io/usps-import:preview
-    command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
-    environment:
-      - DB_HOST=uspsdb
-      - DB_NAME=uspsdb
-      - DB_USER=usps
-      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}            
-volumes:
-   usasdata:
-   uspsdata:
\ No newline at end of file