X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=6ea28d8c8cf52e9a2565c97b50438e18936b5b28;hb=17378f0950d70f1e6d69cecdb5b96e5b923acbac;hp=d7b7da7da15a5c30866b75b0bd570ad8f6249617;hpb=c25c4cb80a30838bea3cac54755a47495370bf24;p=holmes%2Fengine-management.git

diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile
index d7b7da7..6ea28d8 100644
--- a/engine-d-standalone/src/main/assembly/Dockerfile
+++ b/engine-d-standalone/src/main/assembly/Dockerfile
@@ -2,9 +2,18 @@ FROM openresty/openresty:alpine
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-#install java-1.8-openjdk
+EXPOSE 9102 9202
 
-ENV LANG C.UTF-8
+ENV HOSTNAME=holmes-engine-mgmt \
+    LANG=C.UTF-8 \
+    JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk \
+    PATH=$PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin \
+    JAVA_ALPINE_VERSION=8.242.08-r0 \
+    PG_VERSION=12.2-r0
+
+#add the backend package to the docker image
+WORKDIR /home/holmes
+ADD holmes-engine-d-standalone-*-linux64.tar.gz /home/holmes/
 
 # add a simple script that can auto-detect the appropriate JAVA_HOME value
 # based on whether the JDK or only the JRE is installed
@@ -14,34 +23,27 @@ RUN { \
         echo; \
         echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
     } > /usr/local/bin/docker-java-home \
-    && chmod +x /usr/local/bin/docker-java-home
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
-
-ENV JAVA_VERSION 8u131
-ENV JAVA_ALPINE_VERSION 8.131.11-r2
-
-RUN set -x \
-    && apk add --no-cache \
-        openjdk8="$JAVA_ALPINE_VERSION" \
-    && [ "$JAVA_HOME" = "$(docker-java-home)" ]
-
-
-#add activemq to the docker image
-RUN mkdir /home/downloads
-RUN mkdir /home/activemq
-RUN cd /home/downloads
-RUN apt-get update
-RUN apt-get install -y wget
-RUN wget http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.tar.gz
-RUN tar -xzvf apache-activemq-5.9.0-bin.tar.gz -C /home/activemq/
-RUN rm -rf /home/downloads
-
-#add holmes related resources to the docker image
-RUN mkdir /home/holmes
-WORKDIR /home/holmes
-ADD holmes-engine-d-standalone-*-linux64.tar.gz /home/holmes/
-
-RUN chmod 755 /home/holmes/bin/*.sh
+    && chmod +x /usr/local/bin/docker-java-home \
+    && set -x \
+    #install java-1.8-openjdk
+    && apk add --no-cache openjdk8="$JAVA_ALPINE_VERSION" \
+    && [ "$JAVA_HOME" = "$(docker-java-home)" ] \
+    #install neccessary tools
+    && apk upgrade \
+    && apk update \
+    && apk add --no-cache curl \
+    && apk add --no-cache wget \
+    && apk add --no-cache postgresql-client="$PG_VERSION" \
+    && apk add --no-cache nss \
+
+    #switch the user to holmes
+    && addgroup -S holmes && adduser -S -G holmes holmes \
+
+    && chmod -R a+rw /home/holmes/ \
+    && chmod -R a+rw /var/log/ \
+    && chmod 755 /home/holmes/bin/*.sh
+
+USER holmes
+
+CMD ["sh", "/home/holmes/bin/run.sh"]
 
-ENTRYPOINT /home/holmes/bin/run.sh