Merge "There is no Java 8 in Debian 'buster' (part 3)" into stable/stein

Author: Zuul

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

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

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