Merge "Switch to headless jre"
This commit is contained in:
commit
3d27352181
|
@ -10,15 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set elasticsearch_packages = [
|
||||
'elasticsearch',
|
||||
'java-1.8.0-openjdk'
|
||||
'java-1.8.0-openjdk-headless',
|
||||
] %}
|
||||
|
||||
ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
|
||||
|
||||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
||||
{% set elasticsearch_packages = [
|
||||
'elasticsearch',
|
||||
'openjdk-8-jre'
|
||||
'default-jre-headless',
|
||||
'elasticsearch',
|
||||
] %}
|
||||
|
||||
{% if base_arch == 'x86_64' %}
|
||||
|
|
|
@ -9,11 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set kafka_packages = [
|
||||
'java-1.8.0-openjdk',
|
||||
'java-1.8.0-openjdk-headless',
|
||||
] %}
|
||||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
||||
{% set kafka_packages = [
|
||||
'default-jre',
|
||||
'default-jre-headless',
|
||||
] %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
@ -9,11 +9,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
|
||||
{% block opendaylight_install %}
|
||||
|
||||
{% set opendaylight_packages = ['opendaylight'] %}
|
||||
{% if base_distro in ['debian', 'ubuntu'] %}
|
||||
# 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.
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set opendaylight_packages = [
|
||||
'java-1.8.0-openjdk-headless',
|
||||
'opendaylight',
|
||||
] %}
|
||||
{% 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 %}
|
||||
{{ macros.debian_opendaylight_existing_user_fix() }}
|
||||
{% endblock %}
|
||||
|
|
|
@ -9,11 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set zookeeper_packages = [
|
||||
'java-1.8.0-openjdk',
|
||||
'java-1.8.0-openjdk-headless',
|
||||
] %}
|
||||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
||||
{% set zookeeper_packages = [
|
||||
'default-jre',
|
||||
'default-jre-headless',
|
||||
] %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue