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

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:

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:

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

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:

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:

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:

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: