Dynamically determine image architecture 73/43173/2
authorMohammed Naser <mnaser@vexxhost.com>
Mon, 16 Apr 2018 20:30:42 +0000 (13:30 -0700)
committerJames Forsyth <jf2512@att.com>
Wed, 23 May 2018 20:41:29 +0000 (20:41 +0000)
The image architecture is currently hardcoded, this patch removes
that hardcoded value to allow for ARM64 builds to go through.

Change-Id: I576949e2f09261007f79efc238cde249426c77e6
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
champ-service/src/main/docker/Dockerfile

index 9b23d00..4d21a1e 100644 (file)
@@ -9,7 +9,7 @@ RUN apt-get update
 # Install and setup java8
 RUN apt-get update && apt-get install -y software-properties-common
 RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
-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