From 5ea07ac80bb0d598e2c271c822e0bee9b5899ab5 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 21 Jun 2018 08:11:00 +0000
Subject: [PATCH] 5.6.4-ol-7-r0 release

Prepare container to use read-only ConfigMaps
---
 bitnami/elasticsearch/5/ol-7/Dockerfile       | 27 +++++++++++++++++++
 .../elasticsearch/5/ol-7/docker-compose.yml   | 13 +++++++++
 .../5/ol-7/rootfs/app-entrypoint.sh           | 13 +++++++++
 .../5/ol-7/rootfs/elasticsearch-inputs.json   | 12 +++++++++
 bitnami/elasticsearch/README.md               |  2 +-
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 bitnami/elasticsearch/5/ol-7/Dockerfile
 create mode 100644 bitnami/elasticsearch/5/ol-7/docker-compose.yml
 create mode 100755 bitnami/elasticsearch/5/ol-7/rootfs/app-entrypoint.sh
 create mode 100644 bitnami/elasticsearch/5/ol-7/rootfs/elasticsearch-inputs.json

diff --git a/bitnami/elasticsearch/5/ol-7/Dockerfile b/bitnami/elasticsearch/5/ol-7/Dockerfile
new file mode 100644
index 000000000000..7d7b8c6190bb
--- /dev/null
+++ b/bitnami/elasticsearch/5/ol-7/Dockerfile
@@ -0,0 +1,27 @@
+FROM bitnami/oraclelinux-extras:7-r13
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+# Install required system packages and dependencies
+RUN install_packages glib2 glibc libblkid libffi libgcc libmount libselinux libstdc++ libuuid pcre zlib
+RUN bitnami-pkg install java-1.8.171-3 --checksum eb0af616b0a3ab12bd8559a36e83246eb10e7893f6a654dc14a462246d433e40
+RUN bitnami-pkg unpack elasticsearch-5.6.4-2 --checksum 8c8966e6fa8bacf0574337e958e6c74e8048208dc8c50833655d80a380e04966
+
+COPY rootfs /
+ENV BITNAMI_APP_NAME="elasticsearch" \
+    BITNAMI_IMAGE_VERSION="5.6.4-ol-7-r0" \
+    ELASTICSEARCH_BIND_ADDRESS="" \
+    ELASTICSEARCH_CLUSTER_HOSTS="" \
+    ELASTICSEARCH_CLUSTER_NAME="elasticsearch-cluster" \
+    ELASTICSEARCH_HEAP_SIZE="1024m" \
+    ELASTICSEARCH_IS_DEDICATED_NODE="no" \
+    ELASTICSEARCH_NODE_NAME="" \
+    ELASTICSEARCH_NODE_PORT_NUMBER="9300" \
+    ELASTICSEARCH_NODE_TYPE="master" \
+    ELASTICSEARCH_PLUGINS="" \
+    ELASTICSEARCH_PORT_NUMBER="9200" \
+    PATH="/opt/bitnami/java/bin:/opt/bitnami/elasticsearch/bin:$PATH"
+
+EXPOSE 9200 9300
+
+ENTRYPOINT ["/app-entrypoint.sh"]
+CMD ["nami","start","--foreground","elasticsearch"]
diff --git a/bitnami/elasticsearch/5/ol-7/docker-compose.yml b/bitnami/elasticsearch/5/ol-7/docker-compose.yml
new file mode 100644
index 000000000000..a4d168abfe18
--- /dev/null
+++ b/bitnami/elasticsearch/5/ol-7/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '2'
+
+services:
+  elasticsearch:
+    image: 'bitnami/elasticsearch:5-ol-7'
+    ports:
+      - '9200:9200'
+      - '9300:9300'
+    volumes:
+      - 'elasticsearch_data:/bitnami'
+volumes:
+  elasticsearch_data:
+    driver: local
diff --git a/bitnami/elasticsearch/5/ol-7/rootfs/app-entrypoint.sh b/bitnami/elasticsearch/5/ol-7/rootfs/app-entrypoint.sh
new file mode 100755
index 000000000000..d63fe906c510
--- /dev/null
+++ b/bitnami/elasticsearch/5/ol-7/rootfs/app-entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+print_welcome_page
+
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  nami_initialize elasticsearch
+  info "Starting elasticsearch... "
+fi
+
+exec tini -- "$@"
diff --git a/bitnami/elasticsearch/5/ol-7/rootfs/elasticsearch-inputs.json b/bitnami/elasticsearch/5/ol-7/rootfs/elasticsearch-inputs.json
new file mode 100644
index 000000000000..799b0be07b92
--- /dev/null
+++ b/bitnami/elasticsearch/5/ol-7/rootfs/elasticsearch-inputs.json
@@ -0,0 +1,12 @@
+{
+  "bindAddress": "{{$global.env.ELASTICSEARCH_BIND_ADDRESS}}",
+  "clusterHosts": "{{$global.env.ELASTICSEARCH_CLUSTER_HOSTS}}",
+  "clusterName": "{{$global.env.ELASTICSEARCH_CLUSTER_NAME}}",
+  "isDedicatedNode": "{{$global.env.ELASTICSEARCH_IS_DEDICATED_NODE}}",
+  "javaHeapSize": "{{$global.env.ELASTICSEARCH_HEAP_SIZE}}",
+  "nodeName": "{{$global.env.ELASTICSEARCH_NODE_NAME}}",
+  "nodePort": "{{$global.env.ELASTICSEARCH_NODE_PORT_NUMBER}}",
+  "nodeType": "{{$global.env.ELASTICSEARCH_NODE_TYPE}}",
+  "plugins": "{{$global.env.ELASTICSEARCH_PLUGINS}}",
+  "port": "{{$global.env.ELASTICSEARCH_PORT_NUMBER}}"
+}
\ No newline at end of file
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index 77e0dfa3c8fa..0b674257584d 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -32,7 +32,7 @@ $ docker-compose up -d
 * [`6`, `6.3.0-r1`, `latest` (6/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.3.0-r1/6/Dockerfile)
 * [`6-ol-7`, `6.3.0-ol-7-r1` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.3.0-ol-7-r1/6/ol-7/Dockerfile)
 * [`5`, `5.6.4-r57` (5/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/5.6.4-r57/5/Dockerfile)
-* [`5-ol-7`, `5.0.0-ol-7-r0` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/5.0.0-ol-7-r0/5/ol-7/Dockerfile)
+* [`5-ol-7`, `5.6.4-ol-7-r0` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/5.6.4-ol-7-r0/5/ol-7/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/elasticsearch GitHub repo](https://github.com/bitnami/bitnami-docker-elasticsearch).
 # Get this image