From: James Forsyth <jf2512@att.com>
Date: Wed, 3 Jun 2020 13:41:27 +0000 (+0000)
Subject: Merge "Modify JAVA Env Setting"
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=commitdiff_plain;h=b8ec3c0b5162db7e2ec60d8b2381d3bb115cedf0;hp=f1f34f99b05134035f02854f15131c1132dd4f31

Merge "Modify JAVA Env Setting"
---

diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile
index 3c9b0ca..ef2d01c 100644
--- a/standalone/src/main/assembly/Dockerfile
+++ b/standalone/src/main/assembly/Dockerfile
@@ -1,30 +1,19 @@
-FROM ubuntu:16.04
+FROM openjdk:8-jre-slim
 
-MAINTAINER "Li Zi" <li.zi30@zte.com.cn>
 
-EXPOSE 9518
+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
 
-#install openjdk-1.8
-#RUN sed -i 's#http://archive.ubuntu.com#http://mirrors.163.com#g' /etc/apt/sources.list
-RUN apt-get update
-RUN apt-get install -y openjdk-8-jdk
+ARG user=esr
+ARG group=esr
+RUN groupadd -r $group && useradd -ms /bin/bash $user -g $group && \
+    mkdir /opt/$user && \
+    chown -R $user:$group /opt/$user &&  \
+    mkdir /var/log/$user && \
+    chown -R $user:$group /var/log/$user
+USER $user
+WORKDIR /opt/$user
 
-#configure the JDK
-#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
-
-#add esr related resources to the docker image
-RUN mkdir /home/esr
-RUN groupadd -r esr && useradd -r -g esr esr
-WORKDIR /home/esr
-ADD esr-server-*-linux64.tar.gz /home/esr/
-RUN chmod 755 /home/esr/bin/*.sh
-RUN chown -R esr:esr /home/esr
-
-USER esr
-#ENTRYPOINT /home/esr/bin/run.sh
-ENTRYPOINT ["/bin/bash", "/home/esr/docker/docker-entrypoint.sh"]
+ADD esr-server-*-linux64.tar.gz /opt/$user
+RUN chmod 755 /opt/$user/bin/*.sh
 
+ENTRYPOINT ["/bin/bash", "/home/esr/docker/docker-entrypoint.sh"]
\ No newline at end of file
diff --git a/standalone/src/main/assembly/docker/docker-entrypoint.sh b/standalone/src/main/assembly/docker/docker-entrypoint.sh
index 07f7cad..60b14d5 100644
--- a/standalone/src/main/assembly/docker/docker-entrypoint.sh
+++ b/standalone/src/main/assembly/docker/docker-entrypoint.sh
@@ -21,12 +21,6 @@ echo "MSB_ADDR=$MSB_ADDR"
 # Configure service based on docker environment variables
 /home/esr/docker/instance_config.sh
 
-# Set env
-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 
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
-export PATH=$PATH:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/jre/bin:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin
-export CLASSPATH=.:${JAVA_HOME}/lib:${JRE_HOME}/lib
-export JRE_HOME=${JAVA_HOME}/jre
 
 # Start the microservice
 /home/esr/docker/instance_run.sh