diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-02 17:51:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-02 17:51:06 +0000 |
| commit | a3e5eceb34e5ca0a455e7aba916af413644a6896 (patch) | |
| tree | 0bc1483b56fd3f17be8eb272a73414ca39ea974a | |
| parent | ab476f48cfe1a5fde6a0160df260b0343299edf1 (diff) | |
| parent | 7f8dd3063b9939a4d6346bd4a114805a2484c9c2 (diff) | |
| download | kolla-a3e5eceb34e5ca0a455e7aba916af413644a6896.tar.gz kolla-a3e5eceb34e5ca0a455e7aba916af413644a6896.zip | |
Merge "There is no Java 8 in Debian 'buster' (part 3)" into stable/stein
| -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 %} |