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

templates/molgenis/3/README.md

@@ -1,12 +1,13 @@
 # MOLGENIS
+
 Flexible software for scientific data
 
 ## Rancher configuration
 This template creates a MOLGENIS stack on top of Rancher. It creates 3 docker services:
 
-- MOLGENIS
+- MOLGENIS 
+  - Elasticsearch is packaged with MOLGENIS
 - Postgress
-- ElasticSearch
 
 ## Usage
 - Select MOLGENIS from catalog

templates/molgenis/3/docker-compose.yml

@@ -1,78 +1,42 @@
-  molgenis:
-    image: registry.webhosting.rug.nl/molgenis/molgenis:6.0.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
+app:
+  image: registry.webhosting.rug.nl/molgenis/molgenis:4.1.0
+  ports:
+    - 8081:8080
+  links:
+    - db
+  volumes_from:
+    - 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
+    traefik.port: 8080
 
-  postgres:
+  db:
     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:
+    expose:
       - 5432
+     volumes_from:
+      - postgres-data
     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
-      io.rancher.scheduler.global: true
-
-  opencpu:
-    image: registry.webhosting.rug.nl/molgenis/molgenis-opencpu:6.0.0
-    ports:
-      - 8004:8004
-
-  postgres-data:
+ 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
-#    volumes:
-#      - /usr/share/elasticsearch/data
+      - /opt/molgenis

templates/molgenis/3/rancher-compose.yml

@@ -1,6 +1,6 @@
 .catalog:
   name: molgenis
-  version: v6.0.0
+  version: v4.1.0
   description: Molgenis
   minimum_rancher_version: v1.6.3
   questions:
@@ -25,4 +25,4 @@
     unhealthy_threshold: 3
     request_line: 'GET / HTTP/1.0'
     healthy_threshold: 2
-    response_timeout: 5000
+    response_timeout: 5000