Browse Source

Merge "There is no Java 8 in Debian 'buster'" into stable/stein

tags/8.0.1
Zuul 1 month ago
parent
commit
fb723191bb
3 changed files with 25 additions and 4 deletions
  1. 8
    1
      docker/kafka/Dockerfile.j2
  2. 9
    2
      docker/logstash/Dockerfile.j2
  3. 8
    1
      docker/storm/Dockerfile.j2

+ 8
- 1
docker/kafka/Dockerfile.j2 View File

@@ -12,8 +12,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
12 12
         'java-1.8.0-openjdk-headless',
13 13
     ] %}
14 14
 {% elif base_package_type == 'deb' %}
15
+
16
+    {% if base_distro == 'debian' %}
17
+        {% set java_version = '11' %}
18
+    {% elif base_distro == 'ubuntu' %}
19
+        {% set java_version = '8' %}
20
+    {% endif %}
21
+
15 22
     {% set kafka_packages = [
16
-        'openjdk-8-jre-headless',
23
+        'openjdk-' + java_version + '-jre-headless',
17 24
     ] %}
18 25
 {% endif %}
19 26
 

+ 9
- 2
docker/logstash/Dockerfile.j2 View File

@@ -15,12 +15,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
15 15
 ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
16 16
 
17 17
 {% elif base_package_type == 'deb' %}
18
+
19
+    {% if base_distro == 'debian' %}
20
+        {% set java_version = '11' %}
21
+    {% elif base_distro == 'ubuntu' %}
22
+        {% set java_version = '8' %}
23
+    {% endif %}
24
+
18 25
     {% set logstash_packages = [
19
-        'openjdk-8-jre-headless',
26
+        'openjdk-' + java_version + '-jre-headless',
20 27
         'logrotate'
21 28
     ] %}
22 29
 
23
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{debian_arch}}/
30
+ENV JAVA_HOME /usr/lib/jvm/java-${java_version}-openjdk-{{debian_arch}}/
24 31
 
25 32
 {% endif %}
26 33
 

+ 8
- 1
docker/storm/Dockerfile.j2 View File

@@ -12,8 +12,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
12 12
         'java-1.8.0-openjdk-headless',
13 13
     ] %}
14 14
 {% elif base_package_type == 'deb' %}
15
+
16
+    {% if base_distro == 'debian' %}
17
+        {% set java_version = '11' %}
18
+    {% elif base_distro == 'ubuntu' %}
19
+        {% set java_version = '8' %}
20
+    {% endif %}
21
+
15 22
     {% set storm_packages = [
16
-        'openjdk-8-jre-headless',
23
+        'openjdk-' + java_version + '-jre-headless',
17 24
     ] %}
18 25
 {% endif %}
19 26
 

Loading…
Cancel
Save