X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=3ccd857f282e7caf4f815a4eff1e75ba9a56dcd9;hp=0903fd5214de05703723bc5412a333602052f119;hb=e3fb006f31daa5dc1ab3d0a0521ff6cb5ca9230a;hpb=b0b2af1eca63292df13ae354b8c516691b9415f4

diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile
index 0903fd5..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
 
@@ -22,5 +22,6 @@ WORKDIR /home/esr
 ADD esr-server-*-linux64.tar.gz /home/esr/
 RUN chmod 755 /home/esr/bin/*.sh
 
-ENTRYPOINT /home/esr/bin/run.sh
+#ENTRYPOINT /home/esr/bin/run.sh
+ENTRYPOINT /home/esr/docker/docker-entrypoint.sh