From 399d4d40e7b18110fa58aa4173ea15de9fe7ddf0 Mon Sep 17 00:00:00 2001 From: Vincenzo Ferme Date: Wed, 15 Nov 2017 10:19:51 +0100 Subject: [PATCH] Removes depends_on tag from docker-compose.yml files and documentation Signed-off-by: Vincenzo Ferme --- DEV.md | 4 ---- docker-compose.arm64.yml | 3 --- docker-compose.armhf.yml | 11 ----------- docker-compose.extended.armhf.yml | 8 -------- docker-compose.extended.yml | 12 ------------ docker-compose.yml | 21 +-------------------- 6 files changed, 1 insertion(+), 58 deletions(-) diff --git a/DEV.md b/DEV.md index a423e45f..4074c222 100644 --- a/DEV.md +++ b/DEV.md @@ -52,8 +52,6 @@ Update the Docker stack with this: image: alexellis2/faas-markdownrender:latest labels: function: "true" - depends_on: - - gateway networks: - functions ``` @@ -77,8 +75,6 @@ Update your Docker stack with this definition: image: alexellis2/faas-alpinefunction:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml index 515f43a5..a07a19b4 100644 --- a/docker-compose.arm64.yml +++ b/docker-compose.arm64.yml @@ -22,9 +22,6 @@ services: command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093" ports: - 9090:9090 - depends_on: - - gateway - - alertmanager environment: no_proxy: "gateway" networks: diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml index 5ed3e759..1b774561 100644 --- a/docker-compose.armhf.yml +++ b/docker-compose.armhf.yml @@ -26,9 +26,6 @@ services: command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093" ports: - 9090:9090 - depends_on: - - gateway - - alertmanager environment: no_proxy: "gateway" networks: @@ -59,8 +56,6 @@ services: image: functions/nodeinfo:latest-armhf labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -71,8 +66,6 @@ services: image: functions/markdownrender:latest-armhf labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -82,8 +75,6 @@ services: image: functions/alpine:latest-armhf labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -94,8 +85,6 @@ services: image: functions/alpine:latest-armhf labels: function: "true" - depends_on: - - gateway networks: - functions environment: diff --git a/docker-compose.extended.armhf.yml b/docker-compose.extended.armhf.yml index a1437e03..df2b6cdd 100644 --- a/docker-compose.extended.armhf.yml +++ b/docker-compose.extended.armhf.yml @@ -14,9 +14,6 @@ services: dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD faas_nats_address: "nats" faas_nats_port: 4222 - # Start Add for NATS Streaming - depends_on: - - nats deploy: restart_policy: condition: on-failure @@ -66,9 +63,6 @@ services: command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093" ports: - 9090:9090 - depends_on: - - gateway - - alertmanager environment: no_proxy: "gateway" networks: @@ -98,8 +92,6 @@ services: image: functions/markdownrender:latest-armhf labels: function: "true" - depends_on: - - gateway networks: - functions environment: diff --git a/docker-compose.extended.yml b/docker-compose.extended.yml index 35adc217..3887db50 100644 --- a/docker-compose.extended.yml +++ b/docker-compose.extended.yml @@ -14,9 +14,6 @@ services: dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD faas_nats_address: "nats" faas_nats_port: 4222 - # Start Add for NATS Streaming - depends_on: - - nats deploy: resources: limits: @@ -79,9 +76,6 @@ services: command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093" ports: - 9090:9090 - depends_on: - - gateway - - alertmanager environment: no_proxy: "gateway" networks: @@ -125,8 +119,6 @@ services: image: functions/hubstats:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -147,8 +139,6 @@ services: image: functions/nodeinfo:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -169,8 +159,6 @@ services: image: functions/alpine:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: diff --git a/docker-compose.yml b/docker-compose.yml index 6bd4e6f9..908fb1a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,9 +36,6 @@ services: command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093" ports: - 9090:9090 - depends_on: - - gateway - - alertmanager environment: no_proxy: "gateway" networks: @@ -82,8 +79,6 @@ services: image: functions/webhookstash:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -99,8 +94,6 @@ services: image: functions/hubstats:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -117,8 +110,6 @@ services: image: functions/nodeinfo:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -135,8 +126,6 @@ services: image: functions/alpine:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -155,8 +144,6 @@ services: labels: function: "true" com.faas.max_replicas: "10" - depends_on: - - gateway networks: - functions environment: @@ -174,8 +161,6 @@ services: image: functions/alpine:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -193,8 +178,6 @@ services: image: functions/alpine:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -211,8 +194,6 @@ services: image: functions/markdown-render:latest labels: function: "true" - depends_on: - - gateway networks: - functions environment: @@ -226,4 +207,4 @@ services: networks: functions: driver: overlay - #attachable: true + #attachable: true \ No newline at end of file