From 5342c16687e712add95e7068f8ec7d44ec1476f9 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Mon, 16 Apr 2018 10:11:45 -0700 Subject: 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: If0ee75f1bc8f688a35ad63ecc5ca413fb073490f Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser --- distribution/src/main/assembly/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/src/main/assembly/Dockerfile b/distribution/src/main/assembly/Dockerfile index e88bc2d..5dd1b18 100644 --- a/distribution/src/main/assembly/Dockerfile +++ b/distribution/src/main/assembly/Dockerfile @@ -10,9 +10,9 @@ RUN apt-get update RUN apt-get install -y openjdk-8-jdk #configure the JDK -RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 -ENV PATH $PATH:/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:/usr/lib/jvm/java-8-openjdk-amd64/bin +RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/jre/lib/security/java.security +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) +ENV PATH $PATH:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/jre/bin:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib ENV JRE_HOME ${JAVA_HOME}/jre -- cgit 1.2.3-korg