diff options
| author | Doug Szumski <doug@stackhpc.com> | 2018-07-09 17:16:38 +0100 |
|---|---|---|
| committer | Doug Szumski <doug@stackhpc.com> | 2018-07-16 09:16:32 +0100 |
| commit | e1e298dc9590af24c42361bf767ff8fcd51132ae (patch) | |
| tree | 09992e8de922a37f87c2df2ecf30a7979c05fe70 /docker | |
| parent | a6e5b6e7fcfa4787cefd6258ca8eb95e3dbf6247 (diff) | |
| download | kolla-e1e298dc9590af24c42361bf767ff8fcd51132ae.tar.gz kolla-e1e298dc9590af24c42361bf767ff8fcd51132ae.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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 %} |