소스 검색

Use temurin Java docker images instead of deprecated ones (#12334)

kezhenxu94 2 년 전
부모
커밋
4ea7eec750

+ 2 - 2
.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 ~

+ 1 - 1
.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}

+ 2 - 2
.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 ~

+ 1 - 1
.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}

+ 1 - 5
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

+ 1 - 1
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

+ 1 - 5
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

+ 1 - 1
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

+ 1 - 5
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

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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

+ 1 - 5
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

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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}
 
 # Never put sensitive config such as database password here in your production environment,
 # this file will be sourced everytime a new task is executed.