diff options
| author |   GuangrongFu <fu.guangrong@zte.com.cn> | 2020-06-06 17:40:36 +0800 |
|---|---|---|
| committer | GuangrongFu <fu.guangrong@zte.com.cn> | 2020-06-06 17:40:36 +0800 |
| commit | 21019dc4975b06cc801926b19f5e380c0c71a3bd (patch) | |
| tree | 8c9d0bb0c23af14f46fad92618b188150b49d121 | |
| parent | 6cc82cfaeaf14951d937a183eb4da0be3cdb4849 (diff) | |
Update the version of openjdk8
Change-Id: I34ee54c311f229f39c3e45e58cb0949e07c19b70
Issue-ID: HOLMES-314
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
| -rw-r--r-- | engine-d-standalone/src/main/assembly/Dockerfile | 57 |
1 files changed, 26 insertions, 31 deletions
diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile index 322bcf5..cbd45e6 100644 --- a/engine-d-standalone/src/main/assembly/Dockerfile +++ b/engine-d-standalone/src/main/assembly/Dockerfile @@ -4,48 +4,43 @@ MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn> EXPOSE 9102 9202 -ENV HOSTNAME holmes-engine-mgmt +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-r2 -ENV LANG C.UTF-8 - -#install java-1.8-openjdk +#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 -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.222.10-r0 - -RUN set -x \ - && apk add --no-cache \ - openjdk8="$JAVA_ALPINE_VERSION" \ - && [ "$JAVA_HOME" = "$(docker-java-home)" ] - -#install neccessary tools -RUN apk upgrade \ + 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=11.5-r0 \ - && apk add --no-cache nss + && apk add --no-cache nss \ -#switch the user to holmes -RUN addgroup -S holmes && adduser -S -G holmes holmes + #switch the user to holmes + && addgroup -S holmes && adduser -S -G holmes holmes \ -#add the backend package to the docker image -WORKDIR /home/holmes -ADD holmes-engine-d-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 + && chmod -R a+rw /home/holmes/ \ + && chmod -R a+rw /var/log/ \ + && chmod 755 /home/holmes/bin/*.sh USER holmes |