diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-10 15:27:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-10 15:27:32 +0000 |
| commit | a4187d9d021c3c38c11c709435c0c69fee5e5a43 (patch) | |
| tree | c0004a11c93e7816d1f04fb96510c380fb662e72 /docker | |
| parent | bbab10815ceb23993aa29a1743bfe2b3cbd87f6e (diff) | |
| parent | 444e9e7dc714ee4b9574194358c1ef53e5db074d (diff) | |
| download | kolla-a4187d9d021c3c38c11c709435c0c69fee5e5a43.tar.gz kolla-a4187d9d021c3c38c11c709435c0c69fee5e5a43.zip | |
Merge "Pin ODL java version to 8 on ubuntu"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/opendaylight/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index 75b0ca143..ed43d2e8e 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/docker/opendaylight/Dockerfile.j2 @@ -16,8 +16,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set opendaylight_packages = [ - 'default-jre-headless', 'opendaylight', + 'openjdk-8-jre-headless', ] %} # NOTE(egonzalez): ODL fails to install in debian family images with # existing odl user. First install odl and then allow usage of |