From cecfaaf5fa1e2dd6f8c6050e20750b7ec9ba81fb Mon Sep 17 00:00:00 2001
From: Shaun Smekel <shaun.smekel@theorem.net.au>
Date: Fri, 12 Aug 2016 14:29:36 +1000
Subject: [PATCH] Customizations for Elasticsearch

This patchset contains customization of Dockerfile of the
Elasticsearch container.

Change-Id: Icd38897b3a7ce02ab934fea6ad88cc3381546d5e
Partially-implements: blueprint third-party-plugin-support
---
 docker/elasticsearch/Dockerfile.j2 | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index 4a19bce3db..50edc4ab67 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -1,26 +1,27 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% import "macros.j2" as macros with context %}
+
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+    {% set elasticsearch_packages = [
+        'java-1.7.0-openjdk',
+        'elasticsearch'
+    ] %}
 
 ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
 
-RUN yum -y install \
-        java-1.7.0-openjdk \
-        elasticsearch \
-    && yum clean all
-
 {% elif base_distro in ['ubuntu', 'debian'] %}
+    {% set elasticsearch_packages = [
+       'openjdk-7-jre',
+       'elasticsearch'
+    ] %}
 
 ENV JAVA_HOME /usr/lib/jvm/java-1.7.0-openjdk-amd64/
 
-RUN apt-get -y install --no-install-recommends \
-       openjdk-7-jre \
-       elasticsearch \
-    && apt-get clean
-
 {% endif %}
 
+RUN {{ macros.install_packages(elasticsearch_packages | customizable("packages")) }}
 COPY elasticsearch_sudoers /etc/sudoers.d/kolla_elasticsearch_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start \
@@ -34,6 +35,8 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 # https://discuss.elastic.co/t/running-as-non-root-user-service-wrapper-has-changed/7863
 RUN usermod -s /bin/bash elasticsearch -d /usr/share/elasticsearch
 
+{% block elasticsearch_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER elasticsearch