diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/elasticsearch | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/elasticsearch')
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index dd7aa4d0f..8aef0c6be 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -9,16 +9,16 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set elasticsearch_packages = [ - 'java-1.7.0-openjdk', - 'elasticsearch' + 'elasticsearch', + 'java-1.7.0-openjdk' ] %} ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/ {% elif base_distro in ['ubuntu', 'debian'] %} {% set elasticsearch_packages = [ - 'openjdk-8-jre', - 'elasticsearch' + 'elasticsearch', + 'openjdk-8-jre' ] %} ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ |
