Bläddra i källkod

[Bug] init docker compose DATABASE env (#10244)

skip source env if in docker
caishunfeng 2 år sedan
förälder
incheckning
4351148f36
2 ändrade filer med 4 tillägg och 1 borttagningar
  1. 1 0
      deploy/docker/.env
  2. 3 1
      dolphinscheduler-tools/src/main/bin/upgrade-schema.sh

+ 1 - 0
deploy/docker/.env

@@ -19,5 +19,6 @@ HUB=ghcr.io/apache/dolphinscheduler
 TAG=latest
 
 TZ=Asia/Shanghai
+DATABASE=postgresql
 SPRING_DATASOURCE_URL=jdbc:postgresql://dolphinscheduler-postgresql:5432/dolphinscheduler
 REGISTRY_ZOOKEEPER_CONNECT_STRING=dolphinscheduler-zookeeper:2181

+ 3 - 1
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"}