Mercurial > public > ssdt-docker

diff compose3/preview/training.yml @ 110:950df79a9d65 feature/djs-DEP-12-docker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DEP-12: update password configuration
author smith@nwoca.org
date Mon, 24 Apr 2017 15:20:17 +0100
parents 6ca3e22d50e4
children 40d81a3dd3cc
line wrap: on
line diff
--- a/compose3/preview/training.yml	Fri Apr 21 20:42:58 2017 +0100
+++ b/compose3/preview/training.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -1,41 +1,34 @@
-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
-
+version: "3"
+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