Browse Source

Merge "There is no Java 8 in Debian 'buster' (part 2)" into stable/stein

tags/8.0.1
Zuul 1 month ago
parent
commit
fc9ce2a363
2 changed files with 17 additions and 2 deletions
  1. 8
    1
      docker/monasca/monasca-thresh/Dockerfile.j2
  2. 9
    1
      docker/opendaylight/Dockerfile.j2

+ 8
- 1
docker/monasca/monasca-thresh/Dockerfile.j2 View File

@@ -24,8 +24,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
24 24
 ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
25 25
 
26 26
 {% elif base_package_type == 'deb' %}
27
+
28
+    {% if base_distro == 'debian' %}
29
+        {% set java_version = '11' %}
30
+    {% elif base_distro == 'ubuntu' %}
31
+        {% set java_version = '8' %}
32
+    {% endif %}
33
+
27 34
     {% set monasca_thresh_packages = [
28
-        'openjdk-8-jdk-headless',
35
+        'openjdk-' + java_version + '-jdk-headless',
29 36
         'maven',
30 37
     ] %}
31 38
 

+ 9
- 1
docker/opendaylight/Dockerfile.j2 View File

@@ -15,10 +15,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
15 15
         'opendaylight',
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 opendaylight_packages = [
19 26
         'opendaylight',
20
-        'openjdk-8-jre-headless',
27
+        'openjdk-' + java_version + '-jre-headless',
21 28
     ] %}
29
+
22 30
     # NOTE(egonzalez): ODL fails to install in debian family images with
23 31
     # existing odl user. First install odl and then allow usage of
24 32
     # install_packages macro for custom configs.

Loading…
Cancel
Save