From 54c5e8040a32e10d95cca214707701949f39f30e Mon Sep 17 00:00:00 2001 From: caishunfeng Date: Thu, 26 May 2022 13:50:59 +0800 Subject: [PATCH] [Bug] init docker compose DATABASE env (#10244) skip source env if in docker (cherry picked from commit 4351148f36b2ab63303d95a26e8f3330eb3c74e3) --- deploy/docker/.env | 1 + dolphinscheduler-tools/src/main/bin/upgrade-schema.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/docker/.env b/deploy/docker/.env index 52094a8b51..04b44500b4 100755 --- a/deploy/docker/.env +++ b/deploy/docker/.env @@ -19,5 +19,6 @@ HUB=apache TAG=3.0.0-beta-1 TZ=Asia/Shanghai +DATABASE=postgresql SPRING_DATASOURCE_URL=jdbc:postgresql://dolphinscheduler-postgresql:5432/dolphinscheduler REGISTRY_ZOOKEEPER_CONNECT_STRING=dolphinscheduler-zookeeper:2181 diff --git a/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh b/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh index 055157bc2b..0541c35c4d 100755 --- a/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh +++ b/dolphinscheduler-tools/src/main/bin/upgrade-schema.sh @@ -19,7 +19,9 @@ BIN_DIR=$(dirname $0) DOLPHINSCHEDULER_HOME=${DOLPHINSCHEDULER_HOME:-$(cd $BIN_DIR/../..; pwd)} -source "$DOLPHINSCHEDULER_HOME/bin/env/dolphinscheduler_env.sh" +if [ "$DOCKER" != "true" ]; then + source "$DOLPHINSCHEDULER_HOME/bin/env/dolphinscheduler_env.sh" +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"}