From: Mohammed Naser <mnaser@vexxhost.com>
Date: Mon, 16 Apr 2018 20:30:42 +0000 (-0700)
Subject: Dynamically determine image architecture
X-Git-Tag: 1.3.0~31^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a25b378e3401d9bc5a36d4e0ebad0ac4fba73002;p=aai%2Fchamp.git

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: I576949e2f09261007f79efc238cde249426c77e6
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
---

diff --git a/champ-service/src/main/docker/Dockerfile b/champ-service/src/main/docker/Dockerfile
index 9b23d00..4d21a1e 100644
--- a/champ-service/src/main/docker/Dockerfile
+++ b/champ-service/src/main/docker/Dockerfile
@@ -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