chore(0 and 1): added latest and stable tag

templates/molgenis/2/README.md

@@ -1,16 +1,17 @@
 # MOLGENIS
-Flexible software for scientific data
+### Flexible software for scientific data
+#### Process, manage, query, annotate, integrate, analyse, share
 
-## Rancher configuration
 This template creates a MOLGENIS stack on top of Rancher. It creates 3 docker services:
 
-- MOLGENIS
-- Postgress
-- ElasticSearch
+- MOLGENIS instance
+- Postgress instance
+- ElasticSearch instance
+
+## Usage:
 
-## Usage
 - Select MOLGENIS from catalog
-- The stack-name must not be altered (this is hardcoded in de docker-compose file) 
-- Click *Launch*
+- Enter the name of the replica set
+- Click deploy
 
 MOLGENIS can now be accessed over the Rancher network.

templates/molgenis/2/docker-compose.yml

@@ -1,79 +1,21 @@
-  molgenis:
-    image: registry.webhosting.rug.nl/molgenis/molgenis:5.2.0
-    ports:
-      - 8080
-    links:
-      - postgres
-      - elasticsearch
-    volumes_from:
-      - molgenis-data
-    labels:
-      io.rancher.sidekicks: molgenis-data
-      io.rancher.container.pull_image: always
-      io.rancher.scheduler.global: true
-      traefik.frontend.rule: Host:${DOMAINS}
-      traefik.backend: ${TRAEFIK_BACKEND}
-      traefik.enable: true
-      traefik.port: 8080
-
-  postgres:
-    image: postgres:9.6-alpine
-    environment:
-      - POSTGRES_USER=molgenis
-      - POSTGRES_PASSWORD=molgenis
-      - POSTGRES_DB=molgenis
-      - PGDATA=/var/lib/postgresql/data/pgdata
-    volumes_from:
-      - postgres-data
-    ports:
-      - 5432
-    labels:
-      io.rancher.sidekicks: postgres-data
-      io.rancher.scheduler.global: true
-
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1
-    environment:
-      - "cluster.name=molgenis"
-      - "bootstrap.memory_lock=true"
-      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
-      - "xpack.security.enabled=false"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-#    volumes_from:
-#      - elasticsearch-data
-    ports:
-       - 9200:9200
-       - 9300:9300
-#    labels:
-      #io.rancher.sidekicks: elasticsearch-data
-
-  opencpu:
-    image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:5.2.0
-    ports:
-      - 8004:8004
-
-  postgres-data:
-    image: busybox
-    labels:
-      io.rancher.container.start_once: true
-    volumes:
-      - /var/lib/postgresql/data/pgdata
-
-  molgenis-data:
-    image: busybox
-    labels:
-      io.rancher.container.start_once: true
-    volumes:
-      - /opt/molgenis
-
-#  elasticsearch-data:
-#    image: busybox
-#    labels:
-#      io.rancher.container.start_once: true
-#      io.rancher.scheduler.affinity:host_label: type=molgenis
-#      io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis
-#    volumes:
-#      - /usr/share/elasticsearch/data
+app:
+  image: registry.webhosting.rug.nl/molgenis:2.0.1
+  ports:
+    - 8081:8080
+  links:
+    - db
+  volumes:
+    - app-data:/opt/molgenis
+  labels:
+    io.rancher.container.create_agent: true
+    io.rancher.scheduler.global: true
+    traefik.frontend.rule: Host:${DOMAINS}
+    traefik.backend: ${TRAEFIK_BACKEND}
+    traefik.enable: true
+    traefik.port: 8080
+db:
+  image: registry.webhosting.rug.nl/molgenis-postgres:2.0.1
+  expose:
+    - 5432
+  volumes:
+    - db-data:/var/lib/postgresql/data

templates/molgenis/2/rancher-compose.yml

@@ -1,6 +1,6 @@
 .catalog:
   name: molgenis
-  version: v5.2.0
+  version: v2.0.0
   description: Molgenis
   minimum_rancher_version: v1.6.3
   questions: