X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=51a0ec534567fffbd32fee0a91db142a1079279e;hb=abdc7bfcaf9431fd507f0e9cd7fbdb96413386cd;hp=db058a2984cab1991b9ec33a965ec80055e841cc;hpb=655a7e2709d5faa20e134a3fe2d1298698b336cd;p=holmes%2Frule-management.git

diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile
index db058a2..51a0ec5 100644
--- a/rulemgt-standalone/src/main/assembly/Dockerfile
+++ b/rulemgt-standalone/src/main/assembly/Dockerfile
@@ -2,13 +2,31 @@ FROM openresty/openresty:alpine
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-EXPOSE 9101 9104 9105 9201
+# 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
 
-ENV HOSTNAME holmes-rule-mgmt
+#add the backend package to the docker image
+WORKDIR /home/holmes
+ADD holmes-rulemgt-standalone-*-linux64.tar.gz /home/holmes/
 
-ENV LANG C.UTF-8
+#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-1.8-openjdk
+#install java-11-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
@@ -18,45 +36,25 @@ 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_ALPINE_VERSION 8.201.08-r0
-
-RUN set -x \
-	&& apk add --no-cache \
-		openjdk8="$JAVA_ALPINE_VERSION" \
-	&& [ "$JAVA_HOME" = "$(docker-java-home)" ]
-
-#install neccessary tools
-RUN apk upgrade \
+	&& 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=10.5-r0
-
-
-
-#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.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 chmod -R a+rw /home/holmes/
-RUN chmod -R a+rw /var/log/
-RUN chmod 755 /home/holmes/bin/*.sh
+    && 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"]