From e1e298dc9590af24c42361bf767ff8fcd51132ae Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Mon, 9 Jul 2018 17:16:38 +0100 Subject: Ensure JAVA_HOME env var contains architecture During the build of the Elasticsearch image, the Dockerfile sets an env var specifying the architecture that the image is built for. This change ensures that this env var is correctly used in the JAVA_HOME directory. Closes-Bug: 1780811 Change-Id: I3eeacabafcc3855165519a739792f0570fdfd5d8 --- docker/elasticsearch/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 9c5c29670..dedb072e4 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -29,7 +29,7 @@ ENV java_arch=arm64 ENV java_arch={{ base_arch }} {% endif %} -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{ java_arch }}/ +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-${java_arch}/ {% endif %} -- cgit v1.2.3