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=03f09c2c3abb395d261ffef1ffdb1b7171e7d44a;hpb=0ab31f4e9e13066be37c4d4dc6b5c117a64b9a18;p=holmes%2Fengine-management.git

diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile
index 03f09c2..13aa247 100644
--- a/engine-d-standalone/src/main/assembly/Dockerfile
+++ b/engine-d-standalone/src/main/assembly/Dockerfile
@@ -1,42 +1,25 @@
-FROM openresty/openresty:alpine
+FROM onap/integration-java17:12.0.0
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-#install java-1.8-openjdk
+USER root
 
-ENV LANG C.UTF-8
+# 9102 - service port
+# 9202 - debugging port
+EXPOSE 9102 9202
 
-# 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 HOSTNAME=holmes-engine-mgmt \
+    LANG=C.UTF-8 \
+    PG_VERSION=12.2-r0
 
-ENV JAVA_VERSION 8u131
-ENV JAVA_ALPINE_VERSION 8.131.11-r2
+ADD holmes-engine-d-standalone-*-linux64.tar.gz /opt/onap/
 
-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
-
-WORKDIR /home/holmes
-
-ADD holmes-engine-d-standalone-*-linux64.tar.gz /home/holmes/
-
-RUN chmod 755 /home/holmes/bin/*.sh
-
-
-CMD /home/holmes/bin/run.sh
+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"]