X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=119321a45cd9698286c949443ebe8a9192e96dd9;hb=750ae4a611050eb0e33f4f5420aa0297b59790e3;hp=dace6dfb93dfcab0735374308426fbe8a2b799a8;hpb=f7a6791e079ccdbd7050635ec9f78ec940fb5d99;p=holmes%2Fengine-management.git

diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile
index dace6df..119321a 100644
--- a/engine-d-standalone/src/main/assembly/Dockerfile
+++ b/engine-d-standalone/src/main/assembly/Dockerfile
@@ -2,7 +2,7 @@ FROM openresty/openresty:alpine
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-EXPOSE 9102 9202 8312
+EXPOSE 9102 9202
 
 ENV HOSTNAME holmes-engine-mgmt
 
@@ -13,21 +13,21 @@ ENV LANG C.UTF-8
 # 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_ALPINE_VERSION 8.181.13-r0
+ENV JAVA_ALPINE_VERSION 8.191.12-r0
 
 RUN set -x \
-	&& apk add --no-cache \
-		openjdk8="$JAVA_ALPINE_VERSION" \
-	&& [ "$JAVA_HOME" = "$(docker-java-home)" ]
+        && apk add --no-cache \
+                openjdk8="$JAVA_ALPINE_VERSION" \
+        && [ "$JAVA_HOME" = "$(docker-java-home)" ]
 
 #install neccessary tools
 RUN apk upgrade \
@@ -36,22 +36,17 @@ RUN apk upgrade \
     && apk add --no-cache wget \
     && apk add --no-cache postgresql-client=10.5-r0
 
-#install ActiveMQ
-RUN mkdir /home/downloads
-RUN mkdir /home/activemq
-RUN cd /home/downloads
-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
+#switch the user to holmes
+RUN addgroup -S holmes && adduser -S -G holmes holmes
 
 #add the backend package to the docker image
-RUN mkdir /home/holmes
 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
 
-CMD ["sh", "/home/holmes/bin/run.sh"]
-
-
+USER holmes
 
+CMD ["sh", "/home/holmes/bin/run.sh"]