X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=27dff2b0a987aa3a3912b7814801a7aaee540e4a;hb=7e8d80c1c033b636c5816fd5e67c661d7ef0a2b8;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..27dff2b 100644
--- a/engine-d-standalone/src/main/assembly/Dockerfile
+++ b/engine-d-standalone/src/main/assembly/Dockerfile
@@ -2,46 +2,52 @@ FROM openresty/openresty:alpine
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-#install java-1.8-openjdk
+EXPOSE 9102 9202
+
+ENV HOSTNAME holmes-engine-mgmt
 
 ENV LANG C.UTF-8
 
+#install java-1.8-openjdk
+
 # add a simple script that can auto-detect the appropriate JAVA_HOME value
 # based on whether the JDK or only the JRE is installed
 RUN { \
-        echo '#!/bin/sh'; \
-        echo 'set -e'; \
-        echo; \
-        echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
-    } > /usr/local/bin/docker-java-home \
-    && chmod +x /usr/local/bin/docker-java-home
+                echo '#!/bin/sh'; \
+                echo 'set -e'; \
+                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
+ENV JAVA_ALPINE_VERSION 8.201.08-r0
 
 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
+        && apk add --no-cache \
+                openjdk8="$JAVA_ALPINE_VERSION" \
+        && [ "$JAVA_HOME" = "$(docker-java-home)" ]
+
+#install neccessary tools
+RUN apk upgrade \
+    && apk update \
+    && apk add --no-cache curl \
+    && apk add --no-cache wget \
+    && apk add --no-cache postgresql-client=10.7-r0 \
+    && apk add --no-cache nss
+
+#switch the user to holmes
+RUN addgroup -S holmes && adduser -S -G holmes holmes
+
+#add the backend package to the docker image
 WORKDIR /home/holmes
 ADD holmes-engine-d-standalone-*-linux64.tar.gz /home/holmes/
-
+RUN chmod -R a+rw /home/holmes/
+RUN chmod -R a+rw /var/log/
 RUN chmod 755 /home/holmes/bin/*.sh
 
-ENTRYPOINT /home/holmes/bin/run.sh
+USER holmes
+
+CMD ["sh", "/home/holmes/bin/run.sh"]
+