diff options
| author |   GuangrongFu <fu.guangrong@zte.com.cn> | 2020-07-10 09:19:47 +0800 |
|---|---|---|
| committer | GuangrongFu <fu.guangrong@zte.com.cn> | 2020-07-16 09:12:01 +0800 |
| commit | eadc4de80148f3457e75b06270370a33dc4751a4 (patch) | |
| tree | 0d027bafc51f6beecab5c6148883745a7b1c262e /engine-d-standalone/src/main/assembly/Dockerfile | |
| parent | e272b13d2522009aece85d9df3d9bf72cb017287 (diff) | |
Updated Java to Ver. 11
Changed the base image to onap/integration-java11:7.0.0
Change-Id: Ib8e2e0d204364bbe4af4055a2d4fef457080b2ef
Issue-ID: HOLMES-302
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'engine-d-standalone/src/main/assembly/Dockerfile')
| -rw-r--r-- | engine-d-standalone/src/main/assembly/Dockerfile | 56 |
1 files changed, 16 insertions, 40 deletions
diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile index 6ea28d8..a1f427a 100644 --- a/engine-d-standalone/src/main/assembly/Dockerfile +++ b/engine-d-standalone/src/main/assembly/Dockerfile @@ -1,49 +1,25 @@ -FROM openresty/openresty:alpine +FROM onap/integration-java11:7.0.0 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn> +USER root + +# 9102 - service port +# 9202 - debugging port EXPOSE 9102 9202 ENV HOSTNAME=holmes-engine-mgmt \ - LANG=C.UTF-8 \ - JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk \ - PATH=$PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin \ - JAVA_ALPINE_VERSION=8.242.08-r0 \ - PG_VERSION=12.2-r0 - -#add the backend package to the docker image -WORKDIR /home/holmes -ADD holmes-engine-d-standalone-*-linux64.tar.gz /home/holmes/ - -# 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 \ - #install java-1.8-openjdk - && apk add --no-cache openjdk8="$JAVA_ALPINE_VERSION" \ - && [ "$JAVA_HOME" = "$(docker-java-home)" ] \ - #install neccessary tools - && apk upgrade \ - && apk update \ - && apk add --no-cache curl \ - && apk add --no-cache wget \ - && apk add --no-cache postgresql-client="$PG_VERSION" \ - && apk add --no-cache nss \ - - #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 + LANG=C.UTF-8 -USER holmes +ADD holmes-engine-d-standalone-*-linux64.tar.gz /opt/onap/ + +RUN apt-get upgrade \ + && apt-get update \ + && apt-get install -y curl postgresql-client-11 \ + && chmod -R a+rw /opt/onap/ \ + && chmod -R a+rw /var/log/ \ + && chmod 755 /opt/onap/bin/*.sh -CMD ["sh", "/home/holmes/bin/run.sh"] +USER onap +ENTRYPOINT ["sh", "/opt/onap/bin/run.sh"] |