X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d-standalone%2Fsrc%2Fmain%2Fassembly%2FDockerfile;h=13aa24757e95444f209b930a34db55cb9071b3ef;hb=084a40dc78e76177b688ac597eaf9c4d00daa158;hp=d8943b6f12c82e10428b5494d03efd710dd5ee24;hpb=37c34f3c2d55f92940f58eaa37dace6edaf91166;p=holmes%2Fengine-management.git

diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile
index d8943b6..13aa247 100644
--- a/engine-d-standalone/src/main/assembly/Dockerfile
+++ b/engine-d-standalone/src/main/assembly/Dockerfile
@@ -1,57 +1,25 @@
-FROM openresty/openresty:alpine
+FROM onap/integration-java17:12.0.0
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-EXPOSE 9102 9202 8312
+USER root
 
-ENV HOSTNAME holmes-engine-mgmt
+# 9102 - service port
+# 9202 - debugging port
+EXPOSE 9102 9202
 
-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 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
-
-#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 755 /home/holmes/bin/*.sh
-
-CMD ["sh", "/home/holmes/bin/run.sh"]
+ENV HOSTNAME=holmes-engine-mgmt \
+    LANG=C.UTF-8 \
+    PG_VERSION=12.2-r0
 
+ADD holmes-engine-d-standalone-*-linux64.tar.gz /opt/onap/
 
+RUN apk update \
+    && apk add --no-cache curl postgresql-client \
+    && 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"]