# HG changeset patch
# User smith@nwoca.org
# Date 1494084463 -3600
# Node ID cf5348287cf684597f64f53e48c0a5906be6fa27
# Parent  2e25338c847e8faa63da153261c9ef2f93598dbb
DEP-12: consolidate compose services

diff -r 2e25338c847e -r cf5348287cf6 compose3/preview/import-usas.yml
--- a/compose3/preview/import-usas.yml	Fri May 05 20:33:26 2017 +0100
+++ b/compose3/preview/import-usas.yml	Sat May 06 16:27:43 2017 +0100
@@ -1,10 +1,6 @@
 version: "2.1"
 services:
   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}
+    extends:
+     file: /ssdt/compose3/preview/usxs-services.yml
+     service: usasimport
diff -r 2e25338c847e -r cf5348287cf6 compose3/preview/import-usps.yml
--- a/compose3/preview/import-usps.yml	Fri May 05 20:33:26 2017 +0100
+++ b/compose3/preview/import-usps.yml	Sat May 06 16:27:43 2017 +0100
@@ -1,10 +1,6 @@
 version: "2.1"
 services:
   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}
\ No newline at end of file
+    extends:
+     file: /ssdt/compose3/preview/usxs-services.yml
+     service: uspsimport
diff -r 2e25338c847e -r cf5348287cf6 compose3/preview/usas-template.yml
--- a/compose3/preview/usas-template.yml	Fri May 05 20:33:26 2017 +0100
+++ b/compose3/preview/usas-template.yml	Sat May 06 16:27:43 2017 +0100
@@ -2,13 +2,11 @@
 services:
   usasdb:
     extends:
-      file: /ssdt/compose3/preview/usas.yml
+      file: /ssdt/compose3/preview/usxs-services.yml
       service: usasdb
-    volumes:
-      - |volumeName|:/var/lib/postgresql/data
   usasapp:
     extends:
-       file: /ssdt/compose3/preview/usas.yml
+       file: /ssdt/compose3/preview/usas-services.yml
        service: usasapp
     depends_on:
       - usasdb
diff -r 2e25338c847e -r cf5348287cf6 compose3/preview/usas.yml
--- a/compose3/preview/usas.yml	Fri May 05 20:33:26 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# base compose file for usas Preview release
-version: "2.1"
-services:
-  usasdb:
-    restart: unless-stopped
-    image: docker.ssdt.io/ssdt-postgres:3
-    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
diff -r 2e25338c847e -r cf5348287cf6 compose3/preview/usps-template.yml
--- a/compose3/preview/usps-template.yml	Fri May 05 20:33:26 2017 +0100
+++ b/compose3/preview/usps-template.yml	Sat May 06 16:27:43 2017 +0100
@@ -2,13 +2,11 @@
 services:
   uspsdb:
     extends:
-      file: /ssdt/compose/preview/usps.yml
+      file: /ssdt/compose3/preview/usxs-services.yml
       service: uspsdb
-    volumes:
-      - |volumeName|:/var/lib/postgresql/data
   uspsapp:
     extends:
-       file: /ssdt/compose/preview/usps.yml
+       file: /ssdt/compose3/preview/usxs-services.yml
        service: uspsapp
     depends_on:
       - uspsdb
diff -r 2e25338c847e -r cf5348287cf6 compose3/preview/usps.yml
--- a/compose3/preview/usps.yml	Fri May 05 20:33:26 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# base compose file for usps Preview release
-version: "2.1"
-services:
-  uspsdb:
-    restart: unless-stopped
-    image: docker.ssdt.io/ssdt-postgres:3
-    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
diff -r 2e25338c847e -r cf5348287cf6 compose3/preview/usxs-services.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose3/preview/usxs-services.yml	Sat May 06 16:27:43 2017 +0100
@@ -0,0 +1,64 @@
+# 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