summaryrefslogtreecommitdiffstats
path: root/distribution
diff options
context:
space:
mode:
authorLi Zi <li.zi30@zte.com.cn>2018-06-29 08:04:26 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-29 08:04:26 +0000
commitf3872f1f9c21a83eebfbed4c4910e28b9f02d24a (patch)
tree70adcfa9f3d29a979d0c84f57a1981c326108fcf /distribution
parent54a7c358f8d900ed03a9139b91864882c60d9028 (diff)
parent5342c16687e712add95e7068f8ec7d44ec1476f9 (diff)
Merge "Dynamically determine image architecture"
Diffstat (limited to 'distribution')
-rw-r--r--distribution/src/main/assembly/Dockerfile6
1 files 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