From b069018e5917ff822415b64f705d304ace350a66 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Mon, 16 Apr 2018 13:46:11 -0700 Subject: [PATCH] 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: I3e2f92cb7716ce5ff7c96f3b22bb37c7c6ba2c39 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser --- sparkybe-onap-application/src/main/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sparkybe-onap-application/src/main/docker/Dockerfile b/sparkybe-onap-application/src/main/docker/Dockerfile index ea68606..06e9d86 100644 --- a/sparkybe-onap-application/src/main/docker/Dockerfile +++ b/sparkybe-onap-application/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 @@ -32,4 +32,4 @@ RUN ln -s /logs $MICRO_HOME/logs EXPOSE 8000 8000 EXPOSE 9517 9517 -CMD ["/opt/app/sparky/bin/start.sh"] \ No newline at end of file +CMD ["/opt/app/sparky/bin/start.sh"] -- 2.16.6