diff options
| author |   Li Zi <li.zi30@zte.com.cn> | 2018-06-29 08:04:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-29 08:04:38 +0000 |
| commit | 7f8d027ddd80f41004ac93b47caa7f7c8721601a (patch) | |
| tree | fb610c17bff9980dc6820629ad273d4d5068193c | |
| parent | 6f31082c9081f9e453b7e279f9591cc11eeb9d92 (diff) | |
| parent | f25d658ef9a096dffe0c47c7d26688bf2476c074 (diff) | |
Merge "Dynamically determine image architecture"
| -rw-r--r-- | standalone/src/main/assembly/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile index 952c871..3ccd857 100644 --- a/standalone/src/main/assembly/Dockerfile +++ b/standalone/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 |