summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-10 15:27:32 +0000
committerGerrit Code Review <review@openstack.org>2018-09-10 15:27:32 +0000
commita4187d9d021c3c38c11c709435c0c69fee5e5a43 (patch)
treec0004a11c93e7816d1f04fb96510c380fb662e72
parentbbab10815ceb23993aa29a1743bfe2b3cbd87f6e (diff)
parent444e9e7dc714ee4b9574194358c1ef53e5db074d (diff)
Merge "Pin ODL java version to 8 on ubuntu"
-rw-r--r--docker/opendaylight/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2
index 75b0ca1..ed43d2e 100644
--- a/docker/opendaylight/Dockerfile.j2
+++ b/docker/opendaylight/Dockerfile.j2
@@ -16,8 +16,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
16 ] %} 16 ] %}
17{% elif base_distro in ['debian', 'ubuntu'] %} 17{% elif base_distro in ['debian', 'ubuntu'] %}
18 {% set opendaylight_packages = [ 18 {% set opendaylight_packages = [
19 'default-jre-headless',
20 'opendaylight', 19 'opendaylight',
20 'openjdk-8-jre-headless',
21 ] %} 21 ] %}
22 # NOTE(egonzalez): ODL fails to install in debian family images with 22 # NOTE(egonzalez): ODL fails to install in debian family images with
23 # existing odl user. First install odl and then allow usage of 23 # existing odl user. First install odl and then allow usage of