From e04428f8f52e3ef14997b16bb1f3f3e3bf1bdfe5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 16 Jul 2019 14:50:15 +0200 Subject: There is no Java 8 in Debian 'buster' (part 2) Debian 'buster' release contains Java 11 only. So opendaylight and monasca-thresh images needed adjustments. Change-Id: I78f8be44436b8c8e5f58fea40a762c17e6b510a8 --- docker/monasca/monasca-thresh/Dockerfile.j2 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docker/monasca') diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 689799600..47cbc6e70 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -24,8 +24,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 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 monasca_thresh_packages = [ - 'openjdk-8-jdk-headless', + 'openjdk-' + java_version + '-jdk-headless', 'maven', ] %} -- cgit v1.2.3