From ecadca4a63a1df5b3e7f68384e501487828d97e9 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 21 Mar 2019 07:21:39 +0000
Subject: [PATCH] 6.6.2-debian-9-r6 release

---
 bitnami/elasticsearch/6/debian-9/Dockerfile   |  4 +-
 bitnami/elasticsearch/README.md               |  2 +-
 .../elasticsearch/docker-compose-cluster.yml  | 42 +++++++++++++++++++
 bitnami/elasticsearch/docker-compose.yml      |  6 +--
 4 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 bitnami/elasticsearch/docker-compose-cluster.yml

diff --git a/bitnami/elasticsearch/6/debian-9/Dockerfile b/bitnami/elasticsearch/6/debian-9/Dockerfile
index 138e6a9ca582..fa86d5a2fdb6 100644
--- a/bitnami/elasticsearch/6/debian-9/Dockerfile
+++ b/bitnami/elasticsearch/6/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras-base:stretch-r195
+FROM bitnami/minideb-extras-base:stretch-r196
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -15,7 +15,7 @@ RUN . ./libcomponent.sh && component_unpack "elasticsearch" "6.6.2-1" --checksum
 COPY rootfs /
 RUN /prepare.sh
 ENV BITNAMI_APP_NAME="elasticsearch" \
-    BITNAMI_IMAGE_VERSION="6.6.2-debian-9-r5" \
+    BITNAMI_IMAGE_VERSION="6.6.2-debian-9-r6" \
     ELASTICSEARCH_BIND_ADDRESS="" \
     ELASTICSEARCH_CLUSTER_HOSTS="" \
     ELASTICSEARCH_CLUSTER_NAME="elasticsearch-cluster" \
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index d80b3fa9eadd..c73965ac8a6f 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -47,7 +47,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`6-rhel-7`, `6.6.2-rhel-7-r10` (6/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.6.2-rhel-7-r10/6/rhel-7/Dockerfile)
 * [`6-ol-7`, `6.6.2-ol-7-r10` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.6.2-ol-7-r10/6/ol-7/Dockerfile)
-* [`6-debian-9`, `6.6.2-debian-9-r5`, `6`, `6.6.2`, `6.6.2-r5`, `latest` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.6.2-debian-9-r5/6/debian-9/Dockerfile)
+* [`6-debian-9`, `6.6.2-debian-9-r6`, `6`, `6.6.2`, `6.6.2-r6`, `latest` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.6.2-debian-9-r6/6/debian-9/Dockerfile)
 * [`5-ol-7`, `5.6.15-ol-7-r30` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/5.6.15-ol-7-r30/5/ol-7/Dockerfile)
 * [`5-debian-9`, `5.6.15-debian-9-r18`, `5`, `5.6.15`, `5.6.15-r18` (5/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/5.6.15-debian-9-r18/5/debian-9/Dockerfile)
 
diff --git a/bitnami/elasticsearch/docker-compose-cluster.yml b/bitnami/elasticsearch/docker-compose-cluster.yml
new file mode 100644
index 000000000000..3c607d157ff2
--- /dev/null
+++ b/bitnami/elasticsearch/docker-compose-cluster.yml
@@ -0,0 +1,42 @@
+version: '2'
+services:
+  elasticsearch-node1:
+    image: bitnami/elasticsearch:latest
+    environment:
+      - ELASTICSEARCH_CLUSTER_NAME=elasticsearch-cluster
+      - ELASTICSEARCH_CLUSTER_HOSTS=elasticsearch-node1,elasticsearch-node2,elasticsearch-node3
+      - ELASTICSEARCH_NODE_NAME=elastic-node1
+      - ELASTICSEARCH_HEAP_SIZE=1g
+    ports:
+      - '9200:9200'
+      - '9300:9300'
+    volumes:
+      - 'elasticsearch_node1_data:/bitnami'
+
+  elasticsearch-node2:
+    image: bitnami/elasticsearch:latest
+    environment:
+      - ELASTICSEARCH_CLUSTER_NAME=elasticsearch-cluster
+      - ELASTICSEARCH_CLUSTER_HOSTS=elasticsearch-node1,elasticsearch-node2,elasticsearch-node3
+      - ELASTICSEARCH_NODE_NAME=elastic-node2
+      - ELASTICSEARCH_HEAP_SIZE=1g
+    volumes:
+      - 'elasticsearch_node2_data:/bitnami'
+
+  elasticsearch-node3:
+    image: bitnami/elasticsearch:latest
+    environment:
+      - ELASTICSEARCH_CLUSTER_NAME=elasticsearch-cluster
+      - ELASTICSEARCH_CLUSTER_HOSTS=elasticsearch-node1,elasticsearch-node2,elasticsearch-node3
+      - ELASTICSEARCH_NODE_NAME=elastic-node3
+      - ELASTICSEARCH_HEAP_SIZE=1g
+    volumes:
+      - 'elasticsearch_node3_data:/bitnami'
+
+volumes:
+  elasticsearch_node1_data:
+    driver: local
+  elasticsearch_node2_data:
+    driver: local
+  elasticsearch_node3_data:
+    driver: local
diff --git a/bitnami/elasticsearch/docker-compose.yml b/bitnami/elasticsearch/docker-compose.yml
index 8ba447239e68..3f6e0bbf70bc 100644
--- a/bitnami/elasticsearch/docker-compose.yml
+++ b/bitnami/elasticsearch/docker-compose.yml
@@ -2,14 +2,12 @@ version: '2'
 
 services:
   elasticsearch:
-    image: 'bitnami/elasticsearch:latest'
-    labels:
-      kompose.service.type: nodeport
+    image: 'bitnami/elasticsearch:6'
     ports:
       - '9200:9200'
       - '9300:9300'
     volumes:
-      - 'elasticsearch_data:/bitnami'
+      - 'elasticsearch_data:/bitnami/elasticsearch/data'
 volumes:
   elasticsearch_data:
     driver: local