From 9f5f3f08061ee2aaef2566a0800e5f061842e6fc Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sat, 17 Mar 2018 21:34:02 +0100
Subject: [PATCH 1/2] feat(docker-compose): moved back to volume mappings

---
 templates/molgenis/0/docker-compose.yml | 44 +++++++++----------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml
index f5d10a3..83919d7 100644
--- a/templates/molgenis/0/docker-compose.yml
+++ b/templates/molgenis/0/docker-compose.yml
@@ -1,12 +1,12 @@
-  molgenis:
+  app:
     image: registry.webhosting.rug.nl/molgenis/molgenis:latest
     ports:
       - 8080
     links:
-      - postgres
+      - app
       - elasticsearch
-    volumes_from:
-      - molgenis-data
+    volumes:
+      - app-data
     environment:
       - "db_uri=jdbc:postgresql://postgres/${DB_SCHEME}?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
       - "db_driver=org.postgresql.Driver"
@@ -24,15 +24,15 @@
       traefik.enable: true
       traefik.port: 8080
 
-  postgres:
+  db:
     image: postgres:9.6-alpine
     environment:
       - POSTGRES_USER=molgenis
       - POSTGRES_PASSWORD=molgenis
       - POSTGRES_DB=${DB_SCHEME}
       - PGDATA=/var/lib/postgresql/data/pgdata
-    volumes_from:
-      - postgres-data
+    volumes:
+      - db-data
     ports:
       - 5432
     labels:
@@ -58,29 +58,17 @@
 #    volumes_from:
 #      - elasticsearch-data
     ports:
-       - 9200:9200
-       - 9300:9300
+       - 9200
+       - 9300
+    volumes:
+       - es-data
     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
+volumes:
+    db-data:
+    app-data:
+    es-data:
+        driver: local
 
-  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

From 687cd33d9d64feddf9bcae293aeab3089f46d615 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sat, 17 Mar 2018 21:42:53 +0100
Subject: [PATCH 2/2] chore(docker-compose): updated services names

---
 templates/molgenis/0/docker-compose.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml
index 83919d7..916eb10 100644
--- a/templates/molgenis/0/docker-compose.yml
+++ b/templates/molgenis/0/docker-compose.yml
@@ -1,4 +1,4 @@
-  app:
+  molgenis:
     image: registry.webhosting.rug.nl/molgenis/molgenis:latest
     ports:
       - 8080
@@ -6,7 +6,7 @@
       - app
       - elasticsearch
     volumes:
-      - app-data
+      - molgenis-data
     environment:
       - "db_uri=jdbc:postgresql://postgres/${DB_SCHEME}?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
       - "db_driver=org.postgresql.Driver"
@@ -24,7 +24,7 @@
       traefik.enable: true
       traefik.port: 8080
 
-  db:
+  postgres:
     image: postgres:9.6-alpine
     environment:
       - POSTGRES_USER=molgenis
@@ -32,7 +32,7 @@
       - POSTGRES_DB=${DB_SCHEME}
       - PGDATA=/var/lib/postgresql/data/pgdata
     volumes:
-      - db-data
+      - postgres-data
     ports:
       - 5432
     labels:
@@ -61,14 +61,14 @@
        - 9200
        - 9300
     volumes:
-       - es-data
+       - elastic-data
     labels:
       #io.rancher.sidekicks: elasticsearch-data
       io.rancher.scheduler.global: true
 
 volumes:
-    db-data:
-    app-data:
-    es-data:
+    postgres-data:
+    molgenis-data:
+    elastic-data:
         driver: local