# HG changeset patch # User smith@nwoca.org # Date 1493922148 -3600 # Node ID 0ede2dda7d990bc18c73552aae6ed124314e668d # Parent 48a6e3795a1fc75af582e582b346b0063c90b35e DEP-12: move depends_on to template due to docker restrictions on extend diff -r 48a6e3795a1f -r 0ede2dda7d99 compose3/preview/usas-template.yml --- 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 diff -r 48a6e3795a1f -r 0ede2dda7d99 compose3/preview/usas.yml --- 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 diff -r 48a6e3795a1f -r 0ede2dda7d99 compose3/preview/usps-template.yml --- /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 diff -r 48a6e3795a1f -r 0ede2dda7d99 compose3/preview/usps.template.yml --- 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 diff -r 48a6e3795a1f -r 0ede2dda7d99 compose3/preview/usps.yml --- 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