diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-22 17:29:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-22 17:29:19 +0000 |
| commit | ae12359b83c514473793a9a42281a786d553b64f (patch) | |
| tree | c97f911d96f932336a83cf00b1f16c311819e077 | |
| parent | 71c75a16a01284aed011c25053134ee90e8dc324 (diff) | |
| parent | 0383aaca7b6282e69761e4c44a7d8e509305e107 (diff) | |
| download | kolla-ae12359b83c514473793a9a42281a786d553b64f.tar.gz kolla-ae12359b83c514473793a9a42281a786d553b64f.zip | |
Merge "There is no Java 8 in Debian 'buster' (part 3)"
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/logstash/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/monasca/monasca-thresh/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index f7deb92e9..7856444b9 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -21,7 +21,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ 'elasticsearch', ] %} -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{debian_arch}}/ +ENV JAVA_HOME /usr/lib/jvm/java-{{java_version}}-openjdk-{{debian_arch}}/ {% endif %} diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 index a377aad75..9652e8ab6 100644 --- a/docker/logstash/Dockerfile.j2 +++ b/docker/logstash/Dockerfile.j2 @@ -27,7 +27,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ 'logrotate' ] %} -ENV JAVA_HOME /usr/lib/jvm/java-${java_version}-openjdk-{{debian_arch}}/ +ENV JAVA_HOME /usr/lib/jvm/java-{{java_version}}-openjdk-{{debian_arch}}/ {% endif %} diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 47cbc6e70..f76ef50e0 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -36,7 +36,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ 'maven', ] %} -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{debian_arch}}/ +ENV JAVA_HOME /usr/lib/jvm/java-{{java_version}}-openjdk-{{debian_arch}}/ {% endif %} |