Merge "Switch to headless jre"

5 files changed, 26 insertions, 12 deletions

diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index 9c5c29670..665f739c0 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -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' %}
diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2
index 5eab225a9..ae6e83e5c 100644
--- a/docker/kafka/Dockerfile.j2
+++ b/docker/kafka/Dockerfile.j2
@@ -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 %}
 
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2
index 8a005b379..75b0ca143 100644
--- a/docker/opendaylight/Dockerfile.j2
+++ b/docker/opendaylight/Dockerfile.j2
@@ -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 %}
diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2
index 81e893999..b2932ccf1 100644
--- a/docker/zookeeper/Dockerfile.j2
+++ b/docker/zookeeper/Dockerfile.j2
@@ -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 %}
 
diff --git a/releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml b/releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml
new file mode 100644
index 000000000..653d65eb5
--- /dev/null
+++ b/releasenotes/notes/prefer_headless_jre-005b5a6f17673e33.yaml
@@ -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.