From 307ae614546c4d094bae5b49477b0de88b708738 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 17 Jun 2019 09:17:32 +0000 Subject: There is no Java 8 in Debian 'buster' Debian 'buster' release contains Java 11 only. So kafka, logstash, storm images needed adjustments. Change-Id: I9f1e809d0ef1955b832dd384912f880088426306 --- docker/logstash/Dockerfile.j2 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'docker/logstash') 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 %} -- cgit v1.2.3