X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Frule-management.git;a=blobdiff_plain;f=rulemgt-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=03630eb3ff85ca5b7e307fd16c7d66e55911bdad;hp=0954df2558f7fc8ccc46db2f6eb9898639eb281f;hb=3151df6463e77aba7f0234a1604b2839450bbc3f;hpb=c5765c3e4a9240403c47a57993adae0a7c6dece9

diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile
index 0954df2..03630eb 100644
--- a/rulemgt-standalone/src/main/assembly/Dockerfile
+++ b/rulemgt-standalone/src/main/assembly/Dockerfile
@@ -1,60 +1,39 @@
-FROM openresty/openresty:alpine
+FROM onap/integration-java11:7.0.0
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-EXPOSE 9101 9104 9105 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
-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.191.12-r0
-
-RUN set -x \
-	&& 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=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
-
-#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
-
-USER holmes
-CMD ["sh", "/home/holmes/bin/run.sh"]
+USER root
+
+# 9101 - service port
+# 9104 - GUI port
+# 9201 - debugging port
+EXPOSE 9101 9104 9201
+
+ENV HOSTNAME=holmes-rule-mgmt \
+    LANG=C.UTF-8
+
+RUN apt-get upgrade \
+    && apt-get update \
+    && apt-get install -y curl postgresql-client-11 nginx
+
+
+ADD holmes-rulemgt-standalone-*-linux64.tar.gz /opt/onap/
+ADD holmes-rulemgt-frontend-*.tar.gz /usr/share/nginx/html/
+ADD nginx-https.conf /etc/nginx/conf.d/
+ADD nginx-http.conf /etc/nginx/conf.d/
+ADD holmes-frontend.key /etc/ssl/private/
+ADD holmes-frontend-selfsigned.crt /etc/ssl/certs/
+ADD dhparam.pem /etc/ssl/certs/
+
+RUN mkdir -p /usr/share/nginx/logs \
+    && chmod -R 777 /usr/share/nginx/ \
+    && chmod -R 777 /var/lib/nginx/ \
+    && chmod -R 755 /etc/ssl/private/ \
+    && chmod -R 777 /etc/nginx/conf.d/ \
+    && chmod -R a+rw /opt/onap/ \
+    && chmod -R a+rw /var/log/ \
+    && chmod 755 /opt/onap/bin/*.sh
+
+USER onap
+ENTRYPOINT ["sh", "/opt/onap/bin/run.sh"]