summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-13 11:53:29 +0000
committerGerrit Code Review <review@openstack.org>2018-07-13 11:53:30 +0000
commit3d273521817ef19191332cf80274174f4c978701 (patch)
treef72c75a472989bd333fc00730f3ae9b62f832874
parentbd5302f0ee917aaa354950ec26d96b79ef857395 (diff)
parent11dcd27994e226bc5c4a9719518ca82b57d863e3 (diff)
Merge "Switch to headless jre"
-rw-r--r--docker/elasticsearch/Dockerfile.j26
-rw-r--r--docker/kafka/Dockerfile.j24
-rw-r--r--docker/opendaylight/Dockerfile.j218
-rw-r--r--docker/zookeeper/Dockerfile.j24
-rw-r--r--releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml6
5 files changed, 26 insertions, 12 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index 9c5c296..665f739 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -10,15 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
10{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} 10{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
11 {% set elasticsearch_packages = [ 11 {% set elasticsearch_packages = [
12 'elasticsearch', 12 'elasticsearch',
13 'java-1.8.0-openjdk' 13 'java-1.8.0-openjdk-headless',
14 ] %} 14 ] %}
15 15
16ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ 16ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
17 17
18{% elif base_distro in ['debian', 'ubuntu'] %} 18{% elif base_distro in ['debian', 'ubuntu'] %}
19 {% set elasticsearch_packages = [ 19 {% set elasticsearch_packages = [
20 'elasticsearch', 20 'default-jre-headless',
21 'openjdk-8-jre' 21 'elasticsearch',
22 ] %} 22 ] %}
23 23
24{% if base_arch == 'x86_64' %} 24{% if base_arch == 'x86_64' %}
diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2
index 5eab225..ae6e83e 100644
--- a/docker/kafka/Dockerfile.j2
+++ b/docker/kafka/Dockerfile.j2
@@ -9,11 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
9 9
10{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} 10{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
11 {% set kafka_packages = [ 11 {% set kafka_packages = [
12 'java-1.8.0-openjdk', 12 'java-1.8.0-openjdk-headless',
13 ] %} 13 ] %}
14{% elif base_distro in ['debian', 'ubuntu'] %} 14{% elif base_distro in ['debian', 'ubuntu'] %}
15 {% set kafka_packages = [ 15 {% set kafka_packages = [
16 'default-jre', 16 'default-jre-headless',
17 ] %} 17 ] %}
18{% endif %} 18{% endif %}
19 19
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2
index 8a005b3..75b0ca1 100644
--- a/docker/opendaylight/Dockerfile.j2
+++ b/docker/opendaylight/Dockerfile.j2
@@ -9,11 +9,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
9 9
10{% block opendaylight_install %} 10{% block opendaylight_install %}
11 11
12{% set opendaylight_packages = ['opendaylight'] %} 12{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
13{% if base_distro in ['debian', 'ubuntu'] %} 13 {% set opendaylight_packages = [
14# NOTE(egonzalez): ODL fails to install in debian family images with 14 'java-1.8.0-openjdk-headless',
15# existing odl user. First install odl and then allow usage of 15 'opendaylight',
16# install_packages macro for custom configs. 16 ] %}
17{% elif base_distro in ['debian', 'ubuntu'] %}
18 {% set opendaylight_packages = [
19 'default-jre-headless',
20 'opendaylight',
21 ] %}
22 # NOTE(egonzalez): ODL fails to install in debian family images with
23 # existing odl user. First install odl and then allow usage of
24 # install_packages macro for custom configs.
17 {% block debian_opendaylight_install_fix_block %} 25 {% block debian_opendaylight_install_fix_block %}
18 {{ macros.debian_opendaylight_existing_user_fix() }} 26 {{ macros.debian_opendaylight_existing_user_fix() }}
19 {% endblock %} 27 {% endblock %}
diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2
index 81e8939..b2932cc 100644
--- a/docker/zookeeper/Dockerfile.j2
+++ b/docker/zookeeper/Dockerfile.j2
@@ -9,11 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
9 9
10{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} 10{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
11 {% set zookeeper_packages = [ 11 {% set zookeeper_packages = [
12 'java-1.8.0-openjdk', 12 'java-1.8.0-openjdk-headless',
13 ] %} 13 ] %}
14{% elif base_distro in ['debian', 'ubuntu'] %} 14{% elif base_distro in ['debian', 'ubuntu'] %}
15 {% set zookeeper_packages = [ 15 {% set zookeeper_packages = [
16 'default-jre', 16 'default-jre-headless',
17 ] %} 17 ] %}
18{% endif %} 18{% endif %}
19 19
diff --git a/releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml b/releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml
new file mode 100644
index 0000000..653d65e
--- /dev/null
+++ b/releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml
@@ -0,0 +1,6 @@
1---
2features:
3 - |
4 Prefer the headless JRE wherever possible. This may be necessary to adjust
5 the override files for customizing the container images where java is
6 installed.