openstack/kolla
Code Issues Proposed changes

There is no Java 8 in Debian 'buster'

Browse Source 
Debian 'buster' release contains Java 11 only. So kafka, logstash, storm
images needed adjustments.

Change-Id: I9f1e809d0ef1955b832dd384912f880088426306
This commit is contained in:
Marcin Juszkiewicz 2019-06-17 09:17:32 +00:00
parent 45ef7176ae
commit 307ae61454
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/kafka/Dockerfile.j2
View File

@ -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 %}

11
docker/logstash/Dockerfile.j2
View File

@ -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 %}

9
docker/storm/Dockerfile.j2
View File

@ -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 %}