Browse Source

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

3.2.0-release
kezhenxu94 2 years ago committed by GitHub
parent
commit
4ea7eec750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .github/workflows/cluster-test/mysql/Dockerfile
  2. 2
      .github/workflows/cluster-test/mysql/dolphinscheduler_env.sh
  3. 4
      .github/workflows/cluster-test/postgresql/Dockerfile
  4. 2
      .github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh
  5. 6
      dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/docker/Dockerfile
  6. 2
      dolphinscheduler-api/src/main/bin/start.sh
  7. 6
      dolphinscheduler-api/src/main/docker/Dockerfile
  8. 2
      dolphinscheduler-master/src/main/bin/start.sh
  9. 6
      dolphinscheduler-master/src/main/docker/Dockerfile
  10. 2
      dolphinscheduler-standalone-server/src/main/bin/start.sh
  11. 2
      dolphinscheduler-standalone-server/src/main/dist-bin/start.sh
  12. 4
      dolphinscheduler-standalone-server/src/main/docker/Dockerfile
  13. 2
      dolphinscheduler-tools/src/main/bin/upgrade-schema.sh
  14. 6
      dolphinscheduler-tools/src/main/docker/Dockerfile
  15. 2
      dolphinscheduler-worker/src/main/bin/start.sh
  16. 4
      dolphinscheduler-worker/src/main/docker/Dockerfile
  17. 2
      script/env/dolphinscheduler_env.sh

4
.github/workflows/cluster-test/mysql/Dockerfile

@ -15,10 +15,10 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
RUN apt update ; \ 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 COPY ./apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root
RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~ RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~

2
.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh

@ -16,7 +16,7 @@
# #
# JAVA_HOME, will use it to start DolphinScheduler server # 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 # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-mysql} export DATABASE=${DATABASE:-mysql}

4
.github/workflows/cluster-test/postgresql/Dockerfile

@ -15,10 +15,10 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
RUN apt update ; \ 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 COPY ./apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz /root
RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~ RUN tar -zxvf /root/apache-dolphinscheduler-*-SNAPSHOT-bin.tar.gz -C ~

2
.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh

@ -16,7 +16,7 @@
# #
# JAVA_HOME, will use it to start DolphinScheduler server # 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 # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-postgresql} export DATABASE=${DATABASE:-postgresql}

6
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/docker/Dockerfile

@ -15,16 +15,12 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
ENV DOCKER true ENV DOCKER true
ENV TZ Asia/Shanghai ENV TZ Asia/Shanghai
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
RUN apt update ; \
apt install -y curl ; \
rm -rf /var/lib/apt/lists/*
WORKDIR $DOLPHINSCHEDULER_HOME WORKDIR $DOLPHINSCHEDULER_HOME
ADD ./target/alert-server $DOLPHINSCHEDULER_HOME ADD ./target/alert-server $DOLPHINSCHEDULER_HOME

2
dolphinscheduler-api/src/main/bin/start.sh

@ -27,6 +27,6 @@ if [[ "$DOCKER" == "true" ]]; then
JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport" JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport"
fi fi
java $JAVA_OPTS \ $JAVA_HOME/bin/java $JAVA_OPTS \
-cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \
org.apache.dolphinscheduler.api.ApiApplicationServer org.apache.dolphinscheduler.api.ApiApplicationServer

6
dolphinscheduler-api/src/main/docker/Dockerfile

@ -15,16 +15,12 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
ENV DOCKER true ENV DOCKER true
ENV TZ Asia/Shanghai ENV TZ Asia/Shanghai
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
RUN apt update ; \
apt install -y curl ; \
rm -rf /var/lib/apt/lists/*
WORKDIR $DOLPHINSCHEDULER_HOME WORKDIR $DOLPHINSCHEDULER_HOME
ADD ./target/api-server $DOLPHINSCHEDULER_HOME ADD ./target/api-server $DOLPHINSCHEDULER_HOME

2
dolphinscheduler-master/src/main/bin/start.sh

@ -27,6 +27,6 @@ if [[ "$DOCKER" == "true" ]]; then
JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport" JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport"
fi fi
java $JAVA_OPTS \ $JAVA_HOME/bin/java $JAVA_OPTS \
-cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \
org.apache.dolphinscheduler.server.master.MasterServer org.apache.dolphinscheduler.server.master.MasterServer

6
dolphinscheduler-master/src/main/docker/Dockerfile

@ -15,16 +15,12 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
ENV DOCKER true ENV DOCKER true
ENV TZ Asia/Shanghai ENV TZ Asia/Shanghai
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
RUN apt update ; \
apt install -y curl ; \
rm -rf /var/lib/apt/lists/*
WORKDIR $DOLPHINSCHEDULER_HOME WORKDIR $DOLPHINSCHEDULER_HOME
ADD ./target/master-server $DOLPHINSCHEDULER_HOME ADD ./target/master-server $DOLPHINSCHEDULER_HOME

2
dolphinscheduler-standalone-server/src/main/bin/start.sh

@ -35,6 +35,6 @@ for d in $DOLPHINSCHEDULER_HOME/libs/*; do
done done
done done
java $JAVA_OPTS \ $JAVA_HOME/bin/java $JAVA_OPTS \
-cp "$DOLPHINSCHEDULER_HOME/conf":"$CP" \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$CP" \
org.apache.dolphinscheduler.StandaloneServer org.apache.dolphinscheduler.StandaloneServer

2
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
done done
java $JAVA_OPTS \ $JAVA_HOME/bin/java $JAVA_OPTS \
-cp "$DOLPHINSCHEDULER_HOME/conf":"$CP" \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$CP" \
org.apache.dolphinscheduler.StandaloneServer org.apache.dolphinscheduler.StandaloneServer

4
dolphinscheduler-standalone-server/src/main/docker/Dockerfile

@ -15,14 +15,14 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
ENV DOCKER true ENV DOCKER true
ENV TZ Asia/Shanghai ENV TZ Asia/Shanghai
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
RUN apt update ; \ RUN apt update ; \
apt install -y curl sudo ; \ apt install -y sudo ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
WORKDIR $DOLPHINSCHEDULER_HOME WORKDIR $DOLPHINSCHEDULER_HOME

2
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_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" \ -cp "$DOLPHINSCHEDULER_HOME/tools/conf":"$DOLPHINSCHEDULER_HOME/tools/libs/*":"$DOLPHINSCHEDULER_HOME/tools/sql" \
-Dspring.profiles.active=upgrade,${DATABASE} \ -Dspring.profiles.active=upgrade,${DATABASE} \
org.apache.dolphinscheduler.tools.datasource.UpgradeDolphinScheduler org.apache.dolphinscheduler.tools.datasource.UpgradeDolphinScheduler

6
dolphinscheduler-tools/src/main/docker/Dockerfile

@ -15,16 +15,12 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
ENV DOCKER true ENV DOCKER true
ENV TZ Asia/Shanghai ENV TZ Asia/Shanghai
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
RUN apt update ; \
apt install -y curl ; \
rm -rf /var/lib/apt/lists/*
WORKDIR $DOLPHINSCHEDULER_HOME WORKDIR $DOLPHINSCHEDULER_HOME
# see doc: https://dolphinscheduler.apache.org/en-us/docs/dev/user_doc/guide/upgrade.html # see doc: https://dolphinscheduler.apache.org/en-us/docs/dev/user_doc/guide/upgrade.html

2
dolphinscheduler-worker/src/main/bin/start.sh

@ -30,6 +30,6 @@ if [[ "$DOCKER" == "true" ]]; then
JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport" JAVA_OPTS="${JAVA_OPTS} -XX:-UseContainerSupport"
fi fi
java $JAVA_OPTS \ $JAVA_HOME/bin/java $JAVA_OPTS \
-cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \ -cp "$DOLPHINSCHEDULER_HOME/conf":"$DOLPHINSCHEDULER_HOME/libs/*" \
org.apache.dolphinscheduler.server.worker.WorkerServer org.apache.dolphinscheduler.server.worker.WorkerServer

4
dolphinscheduler-worker/src/main/docker/Dockerfile

@ -15,14 +15,14 @@
# limitations under the License. # limitations under the License.
# #
FROM openjdk:8-jre-slim-bullseye FROM eclipse-temurin:8-jre
ENV DOCKER true ENV DOCKER true
ENV TZ Asia/Shanghai ENV TZ Asia/Shanghai
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
RUN apt update ; \ RUN apt update ; \
apt install -y curl sudo ; \ apt install -y sudo ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
WORKDIR $DOLPHINSCHEDULER_HOME WORKDIR $DOLPHINSCHEDULER_HOME

2
script/env/dolphinscheduler_env.sh vendored

@ -16,7 +16,7 @@
# #
# JAVA_HOME, will use it to start DolphinScheduler server # 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, # Never put sensitive config such as database password here in your production environment,
# this file will be sourced everytime a new task is executed. # this file will be sourced everytime a new task is executed.

Loading…
Cancel
Save