From 2402b8a6ef4f539123e62578f5f590f06574d40b Mon Sep 17 00:00:00 2001 From: Kerwin <37063904+zhuangchong@users.noreply.github.com> Date: Tue, 18 Oct 2022 18:51:14 +0800 Subject: [PATCH] Use temurin Java docker images instead of deprecated ones (#12334) (#12421) Co-authored-by: kezhenxu94 --- .github/workflows/cluster-test/mysql/Dockerfile | 4 ++-- .../workflows/cluster-test/mysql/dolphinscheduler_env.sh | 2 +- .github/workflows/cluster-test/postgresql/Dockerfile | 4 ++-- .../cluster-test/postgresql/dolphinscheduler_env.sh | 2 +- .../src/main/docker/Dockerfile | 6 +----- dolphinscheduler-api/src/main/bin/start.sh | 2 +- dolphinscheduler-api/src/main/docker/Dockerfile | 6 +----- dolphinscheduler-master/src/main/bin/start.sh | 2 +- dolphinscheduler-master/src/main/docker/Dockerfile | 6 +----- dolphinscheduler-standalone-server/src/main/bin/start.sh | 2 +- .../src/main/dist-bin/start.sh | 2 +- .../src/main/docker/Dockerfile | 4 ++-- dolphinscheduler-tools/src/main/bin/upgrade-schema.sh | 2 +- dolphinscheduler-tools/src/main/docker/Dockerfile | 6 +----- dolphinscheduler-worker/src/main/bin/start.sh | 2 +- dolphinscheduler-worker/src/main/docker/Dockerfile | 4 ++-- script/env/dolphinscheduler_env.sh | 2 +- 17 files changed, 21 insertions(+), 37 deletions(-) diff --git a/.github/workflows/cluster-test/mysql/Dockerfile b/.github/workflows/cluster-test/mysql/Dockerfile index be9ce06154..c7d6abe889 100644 --- a/.github/workflows/cluster-test/mysql/Dockerfile +++ b/.github/workflows/cluster-test/mysql/Dockerfile @@ -15,10 +15,10 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre RUN apt update ; \ - apt install -y curl wget default-mysql-client sudo openssh-server netcat-traditional ; + apt install -y wget default-mysql-client sudo openssh-server netcat-traditional ; COPY ./apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~ diff --git a/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh b/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh index 458fb9d5b2..d06f1ec93b 100755 --- a/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh +++ b/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh @@ -16,7 +16,7 @@ # # JAVA_HOME, will use it to start DolphinScheduler server -export JAVA_HOME=${JAVA_HOME:-/usr/local/openjdk-8} +export JAVA_HOME=${JAVA_HOME:-/opt/java/openjdk} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-mysql} diff --git a/.github/workflows/cluster-test/postgresql/Dockerfile b/.github/workflows/cluster-test/postgresql/Dockerfile index 9f4e750e65..38234ee7b3 100644 --- a/.github/workflows/cluster-test/postgresql/Dockerfile +++ b/.github/workflows/cluster-test/postgresql/Dockerfile @@ -15,10 +15,10 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre RUN apt update ; \ - apt install -y curl wget sudo openssh-server netcat-traditional ; + apt install -y wget sudo openssh-server netcat-traditional ; COPY ./apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~ diff --git a/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh b/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh index cc9364e31d..7214363770 100644 --- a/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh +++ b/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh @@ -16,7 +16,7 @@ # # JAVA_HOME, will use it to start DolphinScheduler server -export JAVA_HOME=${JAVA_HOME:-/usr/local/openjdk-8} +export JAVA_HOME=${JAVA_HOME:-/opt/java/openjdk} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql} diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/docker/Dockerfile b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/docker/Dockerfile index 52e390e4d3..e5256ce326 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/docker/Dockerfile +++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/docker/Dockerfile @@ -15,16 +15,12 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre ENV DOCKER true ENV TZ Asia/Shanghai ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler -RUN apt update ; \ - apt install -y curl ; \ - rm -rf /var/lib/apt/lists/* - WORKDIR $DOLPHINSCHEDULER_HOME ADD ./target/alert-server $DOLPHINSCHEDULER_HOME diff --git a/dolphinscheduler-api/src/main/bin/start.sh b/dolphinscheduler-api/src/main/bin/start.sh index 223e07a53c..18b1dc7893 100644 --- a/dolphinscheduler-api/src/main/bin/start.sh +++ b/dolphinscheduler-api/src/main/bin/start.sh @@ -27,6 +27,6 @@ if [[ "$DOCKER" == "true" ]]; then JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport" fi -java $JAVA_OPTS \ +$JAVA_HOME/bin/java $JAVA_OPTS \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \ org.apache.dolphinscheduler.api.ApiApplicationServer diff --git a/dolphinscheduler-api/src/main/docker/Dockerfile b/dolphinscheduler-api/src/main/docker/Dockerfile index b6bfd6ba79..8b7f1c7f16 100644 --- a/dolphinscheduler-api/src/main/docker/Dockerfile +++ b/dolphinscheduler-api/src/main/docker/Dockerfile @@ -15,16 +15,12 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre ENV DOCKER true ENV TZ Asia/Shanghai ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler -RUN apt update ; \ - apt install -y curl ; \ - rm -rf /var/lib/apt/lists/* - WORKDIR $DOLPHINSCHEDULER_HOME ADD ./target/api-server $DOLPHINSCHEDULER_HOME diff --git a/dolphinscheduler-master/src/main/bin/start.sh b/dolphinscheduler-master/src/main/bin/start.sh index 5373640cc7..bb2582b687 100644 --- a/dolphinscheduler-master/src/main/bin/start.sh +++ b/dolphinscheduler-master/src/main/bin/start.sh @@ -27,6 +27,6 @@ if [[ "$DOCKER" == "true" ]]; then JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport" fi -java $JAVA_OPTS \ +$JAVA_HOME/bin/java $JAVA_OPTS \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \ org.apache.dolphinscheduler.server.master.MasterServer diff --git a/dolphinscheduler-master/src/main/docker/Dockerfile b/dolphinscheduler-master/src/main/docker/Dockerfile index a484b0ce6a..4d9d12843a 100644 --- a/dolphinscheduler-master/src/main/docker/Dockerfile +++ b/dolphinscheduler-master/src/main/docker/Dockerfile @@ -15,16 +15,12 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre ENV DOCKER true ENV TZ Asia/Shanghai ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler -RUN apt update ; \ - apt install -y curl ; \ - rm -rf /var/lib/apt/lists/* - WORKDIR $DOLPHINSCHEDULER_HOME ADD ./target/master-server $DOLPHINSCHEDULER_HOME diff --git a/dolphinscheduler-standalone-server/src/main/bin/start.sh b/dolphinscheduler-standalone-server/src/main/bin/start.sh index c76887a265..f6591ee984 100755 --- a/dolphinscheduler-standalone-server/src/main/bin/start.sh +++ b/dolphinscheduler-standalone-server/src/main/bin/start.sh @@ -35,6 +35,6 @@ for d in $DOLPHINSCHEDULER_HOME/libs/*; do done done -java $JAVA_OPTS \ +$JAVA_HOME/bin/java $JAVA_OPTS \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$CP" \ org.apache.dolphinscheduler.StandaloneServer diff --git a/dolphinscheduler-standalone-server/src/main/dist-bin/start.sh b/dolphinscheduler-standalone-server/src/main/dist-bin/start.sh index 693dbe4faa..f0ca37ea9d 100755 --- a/dolphinscheduler-standalone-server/src/main/dist-bin/start.sh +++ b/dolphinscheduler-standalone-server/src/main/dist-bin/start.sh @@ -38,6 +38,6 @@ for d in alert-server api-server master-server worker-server; do done done -java $JAVA_OPTS \ +$JAVA_HOME/bin/java $JAVA_OPTS \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$CP" \ org.apache.dolphinscheduler.StandaloneServer diff --git a/dolphinscheduler-standalone-server/src/main/docker/Dockerfile b/dolphinscheduler-standalone-server/src/main/docker/Dockerfile index 80713b8b5a..5acab794ca 100644 --- a/dolphinscheduler-standalone-server/src/main/docker/Dockerfile +++ b/dolphinscheduler-standalone-server/src/main/docker/Dockerfile @@ -15,14 +15,14 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre ENV DOCKER true ENV TZ Asia/Shanghai ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler RUN apt update ; \ - apt install -y curl sudo ; \ + apt install -y sudo ; \ rm -rf /var/lib/apt/lists/* WORKDIR $DOLPHINSCHEDULER_HOME diff --git a/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh b/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh index 0541c35c4d..e46b975204 100755 --- a/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh +++ b/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh @@ -25,7 +25,7 @@ fi JAVA_OPTS=${JAVA_OPTS:-"-server -Duser.timezone=${SPRING_JACKSON_TIME_ZONE} -Xms1g -Xmx1g -Xmn512m -XX:+PrintGCDetails -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump.hprof"} -java $JAVA_OPTS \ +$JAVA_HOME/bin/java $JAVA_OPTS \ -cp "$DOLPHINSCHEDULER_HOME/tools/conf":"$DOLPHINSCHEDULER_HOME/tools/libs/*":"$DOLPHINSCHEDULER_HOME/tools/sql" \ -Dspring.profiles.active=upgrade,${DATABASE} \ org.apache.dolphinscheduler.tools.datasource.UpgradeDolphinScheduler diff --git a/dolphinscheduler-tools/src/main/docker/Dockerfile b/dolphinscheduler-tools/src/main/docker/Dockerfile index e4a650aad3..5bddf86817 100644 --- a/dolphinscheduler-tools/src/main/docker/Dockerfile +++ b/dolphinscheduler-tools/src/main/docker/Dockerfile @@ -15,16 +15,12 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre ENV DOCKER true ENV TZ Asia/Shanghai ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler -RUN apt update ; \ - apt install -y curl ; \ - rm -rf /var/lib/apt/lists/* - WORKDIR $DOLPHINSCHEDULER_HOME # see doc: https://dolphinscheduler.apache.org/en-us/docs/dev/user_doc/guide/upgrade.html diff --git a/dolphinscheduler-worker/src/main/bin/start.sh b/dolphinscheduler-worker/src/main/bin/start.sh index 56a799b500..c61b75d0dd 100644 --- a/dolphinscheduler-worker/src/main/bin/start.sh +++ b/dolphinscheduler-worker/src/main/bin/start.sh @@ -30,6 +30,6 @@ if [[ "$DOCKER" == "true" ]]; then JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport" fi -java $JAVA_OPTS \ +$JAVA_HOME/bin/java $JAVA_OPTS \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \ org.apache.dolphinscheduler.server.worker.WorkerServer diff --git a/dolphinscheduler-worker/src/main/docker/Dockerfile b/dolphinscheduler-worker/src/main/docker/Dockerfile index 9b07ef3a74..6eeb49b47d 100644 --- a/dolphinscheduler-worker/src/main/docker/Dockerfile +++ b/dolphinscheduler-worker/src/main/docker/Dockerfile @@ -15,14 +15,14 @@ # limitations under the License. # -FROM openjdk:8-jre-slim-bullseye +FROM eclipse-temurin:8-jre ENV DOCKER true ENV TZ Asia/Shanghai ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler RUN apt update ; \ - apt install -y curl sudo ; \ + apt install -y sudo ; \ rm -rf /var/lib/apt/lists/* WORKDIR $DOLPHINSCHEDULER_HOME diff --git a/script/env/dolphinscheduler_env.sh b/script/env/dolphinscheduler_env.sh index b326d119a1..23648374c2 100755 --- a/script/env/dolphinscheduler_env.sh +++ b/script/env/dolphinscheduler_env.sh @@ -16,7 +16,7 @@ # # JAVA_HOME, will use it to start DolphinScheduler server -export JAVA_HOME=${JAVA_HOME:-/opt/soft/java} +export JAVA_HOME=${JAVA_HOME:-/opt/java/openjdk} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql}