diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-27 13:47:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-27 13:47:01 +0000 |
| commit | 331bcd016f277b1e16451b56e25c19a3e4963107 (patch) | |
| tree | c4d41e96f68b20c93b21306de1ba2ec175881243 | |
| parent | c972e332caa49ac21f192fd1fb9e7045d285f580 (diff) | |
| parent | 307ae614546c4d094bae5b49477b0de88b708738 (diff) | |
| download | kolla-331bcd016f277b1e16451b56e25c19a3e4963107.tar.gz kolla-331bcd016f277b1e16451b56e25c19a3e4963107.zip | |
Merge "There is no Java 8 in Debian 'buster'"
| -rw-r--r-- | docker/kafka/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/logstash/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/storm/Dockerfile.j2 | 9 |
3 files changed, 25 insertions, 4 deletions
diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2 index 8a7ec3fd0..bcb79d8a8 100644 --- a/docker/kafka/Dockerfile.j2 +++ b/docker/kafka/Dockerfile.j2 @@ -12,8 +12,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'java-1.8.0-openjdk-headless', ] %} {% elif base_package_type == 'deb' %} + + {% if base_distro == 'debian' %} + {% set java_version = '11' %} + {% elif base_distro == 'ubuntu' %} + {% set java_version = '8' %} + {% endif %} + {% set kafka_packages = [ - 'openjdk-8-jre-headless', + 'openjdk-' + java_version + '-jre-headless', ] %} {% endif %} diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 index 36d62676e..a377aad75 100644 --- a/docker/logstash/Dockerfile.j2 +++ b/docker/logstash/Dockerfile.j2 @@ -15,12 +15,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ {% elif base_package_type == 'deb' %} + + {% if base_distro == 'debian' %} + {% set java_version = '11' %} + {% elif base_distro == 'ubuntu' %} + {% set java_version = '8' %} + {% endif %} + {% set logstash_packages = [ - 'openjdk-8-jre-headless', + 'openjdk-' + java_version + '-jre-headless', 'logrotate' ] %} -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{debian_arch}}/ +ENV JAVA_HOME /usr/lib/jvm/java-${java_version}-openjdk-{{debian_arch}}/ {% endif %} diff --git a/docker/storm/Dockerfile.j2 b/docker/storm/Dockerfile.j2 index aa3c13f5e..a69b47a6c 100644 --- a/docker/storm/Dockerfile.j2 +++ b/docker/storm/Dockerfile.j2 @@ -12,8 +12,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'java-1.8.0-openjdk-headless', ] %} {% elif base_package_type == 'deb' %} + + {% if base_distro == 'debian' %} + {% set java_version = '11' %} + {% elif base_distro == 'ubuntu' %} + {% set java_version = '8' %} + {% endif %} + {% set storm_packages = [ - 'openjdk-8-jre-headless', + 'openjdk-' + java_version + '-jre-headless', ] %} {% endif %} |