diff compose2/preview/training.yml @ 124:6943c7dd91f6

DEP-12: fix handling of of default vars and volumes
author smith@nwoca.org
date Sat, 06 May 2017 17:12:22 +0100
parents 4875af3f3383
children
line wrap: on
line diff
--- 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
+