openstack/kolla
Code Issues Proposed changes

Switch to headless jre

Browse Source 
Prefer the headless JRE wherever possible. This may be becessary to
adjust the override files for the customization of the containers where
java is installed.

Change-Id: I3479ac9e74aa9e860cf01db20bd7ab5f5cfc9c1a
This commit is contained in:
Martin André 2018-07-08 18:47:55 +02:00
parent 3a644f7764
commit 11dcd27994
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/elasticsearch/Dockerfile.j2
View File

@ -10,15 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set elasticsearch_packages = [ {% set elasticsearch_packages = [
'elasticsearch', 'elasticsearch',
'java-1.8.0-openjdk' 'java-1.8.0-openjdk-headless',
] %} ] %}
ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set elasticsearch_packages = [ {% set elasticsearch_packages = [
'elasticsearch', 'default-jre-headless',
'openjdk-8-jre' 'elasticsearch',
] %} ] %}
{% if base_arch == 'x86_64' %} {% if base_arch == 'x86_64' %}

4
docker/kafka/Dockerfile.j2
View File

@ -9,11 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set kafka_packages = [ {% set kafka_packages = [
'java-1.8.0-openjdk', 'java-1.8.0-openjdk-headless',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set kafka_packages = [ {% set kafka_packages = [
'default-jre', 'default-jre-headless',
] %} ] %}
{% endif %} {% endif %}

18
docker/opendaylight/Dockerfile.j2
View File

@ -9,11 +9,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block opendaylight_install %} {% block opendaylight_install %}
{% set opendaylight_packages = ['opendaylight'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_distro in ['debian', 'ubuntu'] %} {% set opendaylight_packages = [
# NOTE(egonzalez): ODL fails to install in debian family images with 'java-1.8.0-openjdk-headless',
# existing odl user. First install odl and then allow usage of 'opendaylight',
# install_packages macro for custom configs. ] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set opendaylight_packages = [
'default-jre-headless',
'opendaylight',
] %}
# NOTE(egonzalez): ODL fails to install in debian family images with
# existing odl user. First install odl and then allow usage of
# install_packages macro for custom configs.
{% block debian_opendaylight_install_fix_block %} {% block debian_opendaylight_install_fix_block %}
{{ macros.debian_opendaylight_existing_user_fix() }} {{ macros.debian_opendaylight_existing_user_fix() }}
{% endblock %} {% endblock %}

4
docker/zookeeper/Dockerfile.j2
View File

@ -9,11 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set zookeeper_packages = [ {% set zookeeper_packages = [
'java-1.8.0-openjdk', 'java-1.8.0-openjdk-headless',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set zookeeper_packages = [ {% set zookeeper_packages = [
'default-jre', 'default-jre-headless',
] %} ] %}
{% endif %} {% endif %}

6
releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Prefer the headless JRE wherever possible. This may be necessary to adjust
the override files for customizing the container images where java is
installed.