openstack
/
kolla
Code Issues Proposed changes

Merge "There is no Java 8 in Debian 'buster' (part 3)"

This commit is contained in:
Zuul 2019-07-22 17:29:19 +00:00 committed by Gerrit Code Review
parent 71c75a16a0 0383aaca7b
commit ae12359b83
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/elasticsearch/Dockerfile.j2
View File

@ -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 %}

2
docker/logstash/Dockerfile.j2
View File

@ -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 %}

2
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -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 %}