aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammed Naser <mnaser@vexxhost.com>2018-04-16 12:23:31 -0700
committerJames Forsyth <jf2512@att.com>2018-05-23 20:41:45 +0000
commit9fcd2fde2324077ba019cbf845caec4378599613 (patch)
tree2e5c185166c29252e681e6bd9b793b7884cd9b6e
parent4fbee8b6e9a8134e2f99096ef2ae2050eae6f7d9 (diff)
Dynamically determine image architecture
The image architecture is currently hardcoded, this patch removes that hardcoded value to allow for ARM64 builds to go through. Change-Id: I282e75b089147cab5006db869acca95954f3c528 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
-rw-r--r--src/main/docker/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index ad402b2..8578ef6 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y software-properties-common
## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step
RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
RUN export JAVA_HOME
# Build up the deployment folder structure