X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=51a0ec534567fffbd32fee0a91db142a1079279e;hb=abdc7bfcaf9431fd507f0e9cd7fbdb96413386cd;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..51a0ec5 100644
--- a/rulemgt-standalone/src/main/assembly/Dockerfile
+++ b/rulemgt-standalone/src/main/assembly/Dockerfile
@@ -2,47 +2,60 @@ FROM openresty/openresty:alpine
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-#install java-1.8-openjdk
-
-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
-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 holmes related resources to the docker image
-
-RUN mkdir /home/holmes
-
+# 9101 - service port
+# 9104 - GUI port
+# 9201 - debugging port
+EXPOSE 9101 9104 9201
+
+ENV HOSTNAME=holmes-rule-mgmt \
+    LANG=C.UTF-8 \
+    JAVA_HOME=/usr/lib/jvm/java-11-openjdk \
+    PATH=$PATH:/usr/lib/jvm/java-11-openjdk/jre/bin:/usr/lib/jvm/java-11-openjdk/bin \
+    JAVA_ALPINE_VERSION=11.0.5_p10-r0 \
+    PG_VERSION=12.2-r0
+
+#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 755 /home/holmes/bin/*.sh
+#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/public/
+ADD dhparam.pem /etc/ssl/public/
 
+#install java-11-openjdk
 
-ENTRYPOINT /home/holmes/bin/run.sh
-
+# 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 \
+	&& set -x \
+	&& apk upgrade \
+    && apk update \
+    && apk add --no-cache openjdk11="$JAVA_ALPINE_VERSION" \
+    && [ "$JAVA_HOME" = "$(docker-java-home)" ]  \
+    #install neccessary tools
+    && apk add --no-cache curl \
+    && apk add --no-cache postgresql-client="$PG_VERSION" \
+    && apk add --no-cache nss \
+    #add the frontend pacakge to the docker images
+    && rm /etc/nginx/conf.d/default.conf \
+    && chmod -R 777 /usr/local/openresty/nginx/ \
+    && chmod -R 755 /etc/ssl/public \
+    #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"]