X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=8c1a5d941a675397d99552d56fbdea6536794f21;hb=a2c71bbbb43ecb3bdc2c28b1e3d7d4961c400120;hp=e91ec7cbb50fefe3a24a8d28085fe0f72077df8a;hpb=8aa8303f87dd16b7fb609552c2a2921b924b0a7a;p=holmes%2Frule-management.git

diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile
index e91ec7c..8c1a5d9 100644
--- a/rulemgt-standalone/src/main/assembly/Dockerfile
+++ b/rulemgt-standalone/src/main/assembly/Dockerfile
@@ -2,47 +2,63 @@ FROM openresty/openresty:alpine
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-#install java-1.8-openjdk
+EXPOSE 9101 9104 9201
+
+ENV HOSTNAME holmes-rule-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.222.10-r1
 
 RUN set -x \
-    && apk add --no-cache \
-        openjdk8="$JAVA_ALPINE_VERSION" \
-    && [ "$JAVA_HOME" = "$(docker-java-home)" ]
-
-#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 postgresql-client=12.0-r0 \
+    && apk add --no-cache nss
+
+
+#add the frontend pacakge to the docker images
+RUN rm /etc/nginx/conf.d/default.conf
+RUN mkdir -p /etc/ssl/certs/
+RUN mkdir /etc/ssl/private
+ADD holmes-rulemgt-frontend-*.tar.gz /usr/local/openresty/nginx/html/
+ADD nginx-https.conf /usr/local/openresty/nginx/conf
+ADD nginx-http.conf /usr/local/openresty/nginx/conf
+ADD holmes-frontend.key /etc/ssl/private
+ADD holmes-frontend-selfsigned.crt /etc/ssl/certs
+ADD dhparam.pem /etc/ssl/certs
+RUN chmod -R 777 /usr/local/openresty/nginx/
+
+#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-rulemgt-standalone-*-linux64.tar.gz /home/holmes/
-
-#RUN apt-get update
-
-#RUN apt-get install unzip
-
-#RUN unzip -qo holmes-rulemgt-standalone-*-linux64.zip -d .
-
+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"]