Merge branch 'master' of p281392/molgenis-ops-rancher into master

This commit is contained in:
S. Haakma authored and Gogs committed 2018-03-17 22:30:04 +01:00
commit 984437d2e6
7 files changed
+1 -31

No files matched your search

-5
View File
@@ -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:
-5
View File
@@ -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:
+1 -2
View File
@@ -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
-4
View File
@@ -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:
-5
View File
@@ -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:
-5
View File
@@ -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:
-5
View File
@@ -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: