diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-18 21:01:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-18 21:01:55 +0000 |
| commit | cea1c1ebd95e88e0bb2911fea486fe09f600af22 (patch) | |
| tree | a53f9c4f6c1fce4364758a5de52ccebc68c36120 /docker/elasticsearch | |
| parent | 8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff) | |
| parent | ae1322ec10861678abe1137f3013030b34335bc7 (diff) | |
| download | kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip | |
Merge "Use base_package_type"
Diffstat (limited to 'docker/elasticsearch')
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index b7b9845d4..b677f64c6 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='elasticsearch', shell='/bin/bash', homedir='/usr/share/elasticsearch') }} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} {% set elasticsearch_packages = [ 'elasticsearch', 'java-1.8.0-openjdk-headless', @@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ -{% elif base_distro in ['debian', 'ubuntu'] %} +{% elif base_package_type == 'deb' %} {% set elasticsearch_packages = [ 'default-jre-headless', 'elasticsearch', |