From 56653bf9b1340403643b7b4e727465d678078bba Mon Sep 17 00:00:00 2001 From: sido Date: Sat, 17 Mar 2018 22:29:32 +0100 Subject: [PATCH] fix(docker-compose): turn off global scheduling --- templates/molgenis/0/docker-compose.yml | 5 ----- templates/molgenis/1/docker-compose.yml | 5 ----- templates/molgenis/2/docker-compose.yml | 3 +-- templates/molgenis/3/docker-compose.yml | 4 ---- templates/molgenis/4/docker-compose.yml | 5 ----- templates/molgenis/5/docker-compose.yml | 5 ----- templates/molgenis/6/docker-compose.yml | 5 ----- 7 files changed, 1 insertion(+), 31 deletions(-) diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml index 52422db..b9fa82e 100644 --- a/templates/molgenis/0/docker-compose.yml +++ b/templates/molgenis/0/docker-compose.yml @@ -20,7 +20,6 @@ services: - "elasticsearch.transport.addresses=elasticsearch:9300" labels: io.rancher.container.pull_image: always - io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.backend: ${TRAEFIK_BACKEND} traefik.enable: true @@ -37,8 +36,6 @@ services: - postgres-data ports: - 5432 - labels: - io.rancher.scheduler.global: true opencpu: image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:latest @@ -61,8 +58,6 @@ services: - 9300 volumes: - elastic-data - labels: - io.rancher.scheduler.global: true volumes: postgres-data: diff --git a/templates/molgenis/1/docker-compose.yml b/templates/molgenis/1/docker-compose.yml index 013f9b1..f583316 100644 --- a/templates/molgenis/1/docker-compose.yml +++ b/templates/molgenis/1/docker-compose.yml @@ -20,7 +20,6 @@ services: - "elasticsearch.transport.addresses=elasticsearch:9300" labels: io.rancher.container.pull_image: always - io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.backend: ${TRAEFIK_BACKEND} traefik.enable: true @@ -37,8 +36,6 @@ services: - postgres-data ports: - 5432 - labels: - io.rancher.scheduler.global: true opencpu: image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:stable @@ -61,8 +58,6 @@ services: - 9300 volumes: - elastic-data - labels: - io.rancher.scheduler.global: true volumes: postgres-data: diff --git a/templates/molgenis/2/docker-compose.yml b/templates/molgenis/2/docker-compose.yml index fba1978..140dfc1 100644 --- a/templates/molgenis/2/docker-compose.yml +++ b/templates/molgenis/2/docker-compose.yml @@ -8,7 +8,6 @@ services: volumes: - molgenis-data:/opt/molgenis labels: - io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.backend: ${TRAEFIK_BACKEND} traefik.enable: true @@ -23,6 +22,6 @@ services: volumes: postgres-data: + driver: local molgenis-data: - elastic-data: driver: local \ No newline at end of file diff --git a/templates/molgenis/3/docker-compose.yml b/templates/molgenis/3/docker-compose.yml index 3c320bf..3c1addd 100644 --- a/templates/molgenis/3/docker-compose.yml +++ b/templates/molgenis/3/docker-compose.yml @@ -9,8 +9,6 @@ services: volumes: - molgenis-data labels: - io.rancher.sidekicks: molgenis-data - io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.backend: ${TRAEFIK_BACKEND} traefik.enable: true @@ -26,8 +24,6 @@ services: - 5432 volumes: - postgres-data - labels: - io.rancher.scheduler.global: true volumes: molgenis-data: diff --git a/templates/molgenis/4/docker-compose.yml b/templates/molgenis/4/docker-compose.yml index 5633ab8..2946d3c 100644 --- a/templates/molgenis/4/docker-compose.yml +++ b/templates/molgenis/4/docker-compose.yml @@ -20,7 +20,6 @@ services: - "elasticsearch.transport.addresses=elasticsearch:9300" labels: io.rancher.container.pull_image: always - io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.backend: ${TRAEFIK_BACKEND} traefik.enable: true @@ -37,8 +36,6 @@ services: - postgres-data ports: - 5432 - labels: - io.rancher.scheduler.global: true opencpu: image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:5.2.0 @@ -61,8 +58,6 @@ services: - 9300 volumes: - elastic-data - labels: - io.rancher.scheduler.global: true volumes: postgres-data: diff --git a/templates/molgenis/5/docker-compose.yml b/templates/molgenis/5/docker-compose.yml index 83d891e..6435aca 100644 --- a/templates/molgenis/5/docker-compose.yml +++ b/templates/molgenis/5/docker-compose.yml @@ -20,7 +20,6 @@ services: - "elasticsearch.transport.addresses=elasticsearch:9300" labels: io.rancher.container.pull_image: always - io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.backend: ${TRAEFIK_BACKEND} traefik.enable: true @@ -37,8 +36,6 @@ services: - postgres-data ports: - 5432 - labels: - io.rancher.scheduler.global: true opencpu: image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:6.0.0 @@ -61,8 +58,6 @@ services: - 9300 volumes: - elastic-data - labels: - io.rancher.scheduler.global: true volumes: postgres-data: diff --git a/templates/molgenis/6/docker-compose.yml b/templates/molgenis/6/docker-compose.yml index b01b74e..39a7267 100644 --- a/templates/molgenis/6/docker-compose.yml +++ b/templates/molgenis/6/docker-compose.yml @@ -20,7 +20,6 @@ services: - "elasticsearch.transport.addresses=elasticsearch:9300" labels: io.rancher.container.pull_image: always - io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.backend: ${TRAEFIK_BACKEND} traefik.enable: true @@ -37,8 +36,6 @@ services: - postgres-data ports: - 5432 - labels: - io.rancher.scheduler.global: true opencpu: image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:7.0.0 @@ -61,8 +58,6 @@ services: - 9300 volumes: - elastic-data - labels: - io.rancher.scheduler.global: true volumes: postgres-data: