aboutsummaryrefslogtreecommitdiff
path: root/docker/storm
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-06-17 09:17:32 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-06-17 14:39:56 +0000
commit307ae614546c4d094bae5b49477b0de88b708738 (patch)
treee66a2641782fcbad58044f51460fa75a55b50b0b /docker/storm
parent45ef7176aead8d8b59135f8c168094600ea05f31 (diff)
downloadkolla-307ae614546c4d094bae5b49477b0de88b708738.tar.gz
kolla-307ae614546c4d094bae5b49477b0de88b708738.zip
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
Diffstat (limited to 'docker/storm')
-rw-r--r--docker/storm/Dockerfile.j29
1 files changed, 8 insertions, 1 deletions
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 %}