From 50fe73494b25465969a1435e7bb529a3cd743f33 Mon Sep 17 00:00:00 2001
From: Dominic Werner <Dominic.Werner@dolby.com>
Date: Wed, 12 Apr 2017 17:43:55 +0200
Subject: [PATCH] use data containers to make updates possible

---
 templates/es-cluster/0/docker-compose.yml  | 26 ++++++++++++----------
 templates/es-cluster/0/rancher-compose.yml |  2 +-
 templates/es-cluster/config.yml            |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/templates/es-cluster/0/docker-compose.yml b/templates/es-cluster/0/docker-compose.yml
index cf2d3d3..42ed2ae 100644
--- a/templates/es-cluster/0/docker-compose.yml
+++ b/templates/es-cluster/0/docker-compose.yml
@@ -3,6 +3,7 @@ services:
     es-master:
         labels: 
             - io.rancher.container.hostname_override=container_name
+            - io.rancher.sidekicks=es-data
         image: docker.elastic.co/elasticsearch/elasticsearch:5.3.0
         environment: 
             - "cluster.name=${cluster_name}"
@@ -23,12 +24,13 @@ services:
         mem_swappiness: 0
         cap_add: 
             - IPC_LOCK
-        volumes: 
-            - es-master-data:/usr/share/elasticsearch/data
+        volumes_from: 
+            - es-data
 
     es-node:
         labels: 
             - io.rancher.container.hostname_override=container_name
+            - io.rancher.sidekicks=es-data
         image: docker.elastic.co/elasticsearch/elasticsearch:5.3.0
         environment: 
             - "cluster.name=${cluster_name}"
@@ -49,10 +51,18 @@ services:
         mem_swappiness: 0
         cap_add: 
             - IPC_LOCK
-        volumes: 
-            - es-node-data:/usr/share/elasticsearch/data
+        volumes_from: 
+            - es-data
         depends_on: 
             - es-master
+    
+    es-data:
+        labels:
+            - io.rancher.container.start_once=true
+        image: docker.elastic.co/elasticsearch/elasticsearch:5.3.0
+        entrypoint: /bin/true
+        volumes: 
+            - /usr/share/elasticsearch/data
 
     kibana:
         labels: 
@@ -69,11 +79,3 @@ services:
             - "${kibana_port}:5601"
         depends_on:
             - es-master
-
-volumes: 
-    es-master-data:
-        driver: local
-        per_container: true
-    es-node-data:
-        driver: local
-        per_container: true
diff --git a/templates/es-cluster/0/rancher-compose.yml b/templates/es-cluster/0/rancher-compose.yml
index d42d891..c68cec5 100644
--- a/templates/es-cluster/0/rancher-compose.yml
+++ b/templates/es-cluster/0/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
     name: Elasticsearch Cluster
-    version: 5.3.0
+    version: 5.3.0-rancher1
     description: 3-Node Elasticsearch Cluster with Kibana
 
     questions:
diff --git a/templates/es-cluster/config.yml b/templates/es-cluster/config.yml
index 73e47b4..82ba628 100644
--- a/templates/es-cluster/config.yml
+++ b/templates/es-cluster/config.yml
@@ -1,5 +1,5 @@
 name: Elasticsearch Cluster 5.3.0
 description: |
   Elasticsearch, you know for search!
-version: 5.3.0
+version: 5.3.0-rancher1
 category: ELK
\ No newline at end of file