# HG changeset patch
# User smith@nwoca.org
# Date 1494087142 -3600
# Node ID 6943c7dd91f6f4a72674f8f4555838c0a598d7a2
# Parent  48866e4ff8ff506057b170873c44fc5e0968de77
DEP-12: fix handling of of default vars and volumes

diff -r 48866e4ff8ff -r 6943c7dd91f6 compose2/preview/training.yml
--- a/compose2/preview/training.yml	Sat May 06 16:53:16 2017 +0100
+++ b/compose2/preview/training.yml	Sat May 06 17:12:22 2017 +0100
@@ -1,34 +1,41 @@
-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
+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 48866e4ff8ff -r 6943c7dd91f6 compose2/preview/usas-template.yml
--- a/compose2/preview/usas-template.yml	Sat May 06 16:53:16 2017 +0100
+++ b/compose2/preview/usas-template.yml	Sat May 06 17:12:22 2017 +0100
@@ -10,3 +10,5 @@
       service: usasapp-base
     depends_on:
       - usasdb
+volumes:
+  usasdata:
diff -r 48866e4ff8ff -r 6943c7dd91f6 compose2/preview/usps-template.yml
--- a/compose2/preview/usps-template.yml	Sat May 06 16:53:16 2017 +0100
+++ b/compose2/preview/usps-template.yml	Sat May 06 17:12:22 2017 +0100
@@ -10,3 +10,6 @@
        service: uspsapp-base
     depends_on:
       - uspsdb
+volumes:
+  uspsdata:
+  
diff -r 48866e4ff8ff -r 6943c7dd91f6 compose2/preview/usxs-services.yml
--- a/compose2/preview/usxs-services.yml	Sat May 06 16:53:16 2017 +0100
+++ b/compose2/preview/usxs-services.yml	Sat May 06 17:12:22 2017 +0100
@@ -24,7 +24,7 @@
       - 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:-}
+    command: -i ${IMP_IRN- } -u ${IMP_URL- } -r ${IMP_PATH- }
     environment:
       - DB_HOST=usasdb
       - DB_NAME=usasdb
@@ -53,12 +53,10 @@
       - 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:-}
+    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:
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
+      
\ No newline at end of file