Mercurial > public > ssdt-docker

changeset 119:0ede2dda7d99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DEP-12: move depends_on to template due to docker restrictions on extend
author smith@nwoca.org
date Thu, 04 May 2017 19:22:28 +0100
parents 48a6e3795a1f
children 2e25338c847e
files compose3/preview/usas-template.yml compose3/preview/usas.yml compose3/preview/usps-template.yml compose3/preview/usps.template.yml compose3/preview/usps.yml
diffstat 5 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/compose3/preview/usas-template.yml	Thu May 04 19:15:44 2017 +0100
+++ b/compose3/preview/usas-template.yml	Thu May 04 19:22:28 2017 +0100
@@ -9,4 +9,6 @@
   usasapp:
     extends:
        file: /ssdt/compose3/preview/usas.yml
-       service: usasapp
\ No newline at end of file
+       service: usasapp
+    depends_on:
+      - usasdb
--- a/compose3/preview/usas.yml	Thu May 04 19:15:44 2017 +0100
+++ b/compose3/preview/usas.yml	Thu May 04 19:22:28 2017 +0100
@@ -11,8 +11,6 @@
   usasapp:
     restart: unless-stopped
     image: docker.ssdt.io/usas-app:preview
-    depends_on:
-      - usasdb
     environment:
       - DB_HOST=usasdb
       - DB_NAME=usasdb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose3/preview/usps-template.yml	Thu May 04 19:22:28 2017 +0100
@@ -0,0 +1,14 @@
+version: "2.1"
+services:
+  uspsdb:
+    extends:
+      file: /ssdt/compose/preview/usps.yml
+      service: uspsdb
+    volumes:
+      - |volumeName|:/var/lib/postgresql/data
+  uspsapp:
+    extends:
+       file: /ssdt/compose/preview/usps.yml
+       service: uspsapp
+    depends_on:
+      - uspsdb
--- a/compose3/preview/usps.template.yml	Thu May 04 19:15:44 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-version: "2.1"
-services:
-  uspsdb:
-    extends:
-      file: /ssdt/compose/preview/usps.yml
-      service: uspsdb
-    volumes:
-      - |volumeName|:/var/lib/postgresql/data
-  uspsapp:
-    extends:
-       file: /ssdt/compose/preview/usps.yml
-       service: uspsapp
\ No newline at end of file
--- a/compose3/preview/usps.yml	Thu May 04 19:15:44 2017 +0100
+++ b/compose3/preview/usps.yml	Thu May 04 19:22:28 2017 +0100
@@ -11,8 +11,6 @@
   uspsapp:
     restart: unless-stopped
     image: docker.ssdt.io/usps-app:preview
-    depends_on:
-      - uspsdb
     environment:
       - DB_HOST=uspsdb
       - DB_NAME=uspsdb