diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-19 15:41:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-19 15:41:58 +0000 |
| commit | edf0d99dcc9fa1a285283049627623d872fbe807 (patch) | |
| tree | 0a2c939d0e58d21cd3339e241d8e06c9c197977a /docker | |
| parent | 3d1171f0d3932b3636e65adc473c2bacf46093f5 (diff) | |
| parent | cecfaaf5fa1e2dd6f8c6050e20750b7ec9ba81fb (diff) | |
| download | kolla-edf0d99dcc9fa1a285283049627623d872fbe807.tar.gz kolla-edf0d99dcc9fa1a285283049627623d872fbe807.zip | |
Merge "Customizations for Elasticsearch"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 4a19bce3d..50edc4ab6 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 |