From: Mohammed Naser Date: Mon, 16 Apr 2018 20:19:50 +0000 (-0700) Subject: Dynamically determine image architecture X-Git-Tag: v1.2.0~9 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fbabel.git;a=commitdiff_plain;h=04e6b061e130c40e92e3e45c8fd1355f3c99ac29 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: I214208421dd2b1d641166f0cfd977cf33073dc7a Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser --- diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 6fac6e2..362814d 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -10,7 +10,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