From 3fb94926a21935809115ad3672f92afba3f1e99b Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Fri, 9 Mar 2018 08:03:13 +0100
Subject: [PATCH] fix(added version 6): added version 6 to catalogue

---
 templates/molgenis/2/docker-compose.yml  | 19 ++-----
 templates/molgenis/2/rancher-compose.yml | 15 +----
 templates/molgenis/3/README.md           | 16 ++++++
 templates/molgenis/3/docker-compose.yml  | 72 ++++++++++++++++++++++++
 templates/molgenis/3/rancher-compose.yml | 18 ++++++
 5 files changed, 113 insertions(+), 27 deletions(-)
 create mode 100644 templates/molgenis/3/README.md
 create mode 100644 templates/molgenis/3/docker-compose.yml
 create mode 100644 templates/molgenis/3/rancher-compose.yml

diff --git a/templates/molgenis/2/docker-compose.yml b/templates/molgenis/2/docker-compose.yml
index fa781bf..7fbd9d3 100644
--- a/templates/molgenis/2/docker-compose.yml
+++ b/templates/molgenis/2/docker-compose.yml
@@ -1,7 +1,7 @@
   molgenis:
     image: webhost12.service.rug.nl/molgenis/molgenis:5.2.0
     ports:
-      - 8081:8080
+      - 8080
     links:
       - postgres
       - elasticsearch
@@ -9,8 +9,11 @@
       - molgenis-data
     labels:
       io.rancher.sidekicks: molgenis-data
-      io.rancher.scheduler.global: true
       io.rancher.container.pull_image: always
+      io.rancher.scheduler.global: true
+      traefik.frontend.rule: Host:${DOMAINS}
+      traefik.enable: true
+      traefik.port: 8080
 
   postgres:
     image: postgres:9.6-alpine
@@ -43,18 +46,8 @@
     ports:
        - 9200:9200
        - 9300:9300
-    labels:
-      #io.rancher.sidekicks: elasticsearch-data
-      io.rancher.scheduler.global: true
-
-#  loadbalancer:
-#    image: rancher/lb-service-haproxy:v0.7.5
-#    ports:
-#      - 80
 #    labels:
-#      io.rancher.scheduler.global: true
-#      io.rancher.scheduler.affinity:host_label: type=molgenis
-#      io.rancher.scheduler.affinity:container_label: io.rancher.stack.name=molgenis
+      #io.rancher.sidekicks: elasticsearch-data
 
   postgres-data:
     image: busybox
diff --git a/templates/molgenis/2/rancher-compose.yml b/templates/molgenis/2/rancher-compose.yml
index 7b53ec2..9f4fe01 100644
--- a/templates/molgenis/2/rancher-compose.yml
+++ b/templates/molgenis/2/rancher-compose.yml
@@ -2,17 +2,4 @@
   name: molgenis
   version: v5.2.0
   description: Molgenis
-  minimum_rancher_version: v1.6.3
-#loadbalancer:
-#  scale: 1
-#  lb_config:
-#    port_rules:
-#    - source_port: 80
-#      target_port: 8081
-#      service: molgenis
-#  health_check:
-#    port: 42
-#    interval: 2000
-#    unhealthy_threshold: 3
-#    healthy_threshold: 2
-#    response_timeout: 2000
\ No newline at end of file
+  minimum_rancher_version: v1.6.3
\ No newline at end of file
diff --git a/templates/molgenis/3/README.md b/templates/molgenis/3/README.md
new file mode 100644
index 0000000..b65dd55
--- /dev/null
+++ b/templates/molgenis/3/README.md
@@ -0,0 +1,16 @@
+# MOLGENIS
+Flexible software for scientific data
+
+## Rancher configuration
+This template creates a MOLGENIS stack on top of Rancher. It creates 3 docker services:
+
+- MOLGENIS
+- Postgress
+- ElasticSearch
+
+## Usage
+- Select MOLGENIS from catalog
+- The stack-name must not be altered (this is hardcoded in de docker-compose file) 
+- Click *Launch*
+
+MOLGENIS can now be accessed over the Rancher network.
\ No newline at end of file
diff --git a/templates/molgenis/3/docker-compose.yml b/templates/molgenis/3/docker-compose.yml
new file mode 100644
index 0000000..13cce5f
--- /dev/null
+++ b/templates/molgenis/3/docker-compose.yml
@@ -0,0 +1,72 @@
+  molgenis:
+    image: webhost12.service.rug.nl/molgenis/molgenis:6.0.0
+    ports:
+      - 8081:8080
+    links:
+      - postgres
+      - elasticsearch
+    volumes_from:
+      - molgenis-data
+    labels:
+      io.rancher.sidekicks: molgenis-data
+      io.rancher.scheduler.global: true
+      io.rancher.container.pull_image: always
+      traefik.frontend.rule: Host:${DOMAINS}
+      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
+      io.rancher.scheduler.global: true
+
+  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
diff --git a/templates/molgenis/3/rancher-compose.yml b/templates/molgenis/3/rancher-compose.yml
new file mode 100644
index 0000000..7b53ec2
--- /dev/null
+++ b/templates/molgenis/3/rancher-compose.yml
@@ -0,0 +1,18 @@
+.catalog:
+  name: molgenis
+  version: v5.2.0
+  description: Molgenis
+  minimum_rancher_version: v1.6.3
+#loadbalancer:
+#  scale: 1
+#  lb_config:
+#    port_rules:
+#    - source_port: 80
+#      target_port: 8081
+#      service: molgenis
+#  health_check:
+#    port: 42
+#    interval: 2000
+#    unhealthy_threshold: 3
+#    healthy_threshold: 2
+#    response_timeout: 2000
\ No newline at end of file