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

templates/molgenis/0/docker-compose.yml

@@ -3,9 +3,9 @@
     ports:
       - 8080
     links:
-      - postgres
+      - app
       - elasticsearch
-    volumes_from:
+    volumes:
       - molgenis-data
     environment:
       - "db_uri=jdbc:postgresql://postgres/${DB_SCHEME}?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
@@ -31,7 +31,7 @@
       - POSTGRES_PASSWORD=molgenis
       - POSTGRES_DB=${DB_SCHEME}
       - PGDATA=/var/lib/postgresql/data/pgdata
-    volumes_from:
+    volumes:
       - postgres-data
     ports:
       - 5432
@@ -58,29 +58,17 @@
 #    volumes_from:
 #      - elasticsearch-data
     ports:
-       - 9200:9200
-       - 9300:9300
+       - 9200
+       - 9300
+    volumes:
+       - elastic-data
     labels:
       #io.rancher.sidekicks: elasticsearch-data
       io.rancher.scheduler.global: true
 
+volumes:
     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
+    elastic-data:
+        driver: local
 
-#  elasticsearch-data:
-#    image: busybox
-#    labels:
-#      io.rancher.container.start_once: true
-#    volumes:
-#      - /usr/share/elasticsearch/data