openstack/kolla
Code Issues Proposed changes

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

Browse Source 
Good to have proper Java version. Better is when JAVA_HOME is also
adjusted to point to proper directory. And to have it set proper way.

Change-Id: I0f83c3498028135751b0b887665d009e5e19410f
This commit is contained in:
Marcin Juszkiewicz
2019-07-18 17:04:36 +02:00
parent 0e766d57ad
commit 0383aaca7b
3 changed files with 3 additions and 3 deletions
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 %}