From 9283ee2bdfdcdec94c9ba53d6e28a405e029ed67 Mon Sep 17 00:00:00 2001 From: Kirs Date: Tue, 30 Nov 2021 16:00:10 +0800 Subject: [PATCH] [2.0.1-cherrypick] [#7007]transform params to SPRING_DATASOURCE_XXX (#7067) * [2.0.1-cherrypick] [#7007]transform params to SPRING_DATASOURCE_XXX * [2.0.1-cherrypick] [#7007]transform params to SPRING_DATASOURCE_XXX Co-authored-by: zwZjut --- docker/build/startup-init-conf.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/docker/build/startup-init-conf.sh b/docker/build/startup-init-conf.sh index 23f5cfffac..32b71bfdb4 100755 --- a/docker/build/startup-init-conf.sh +++ b/docker/build/startup-init-conf.sh @@ -25,14 +25,18 @@ echo "init env variables" #============================================================================ # Database #============================================================================ -export DATABASE_TYPE=${DATABASE_TYPE:-"postgresql"} -export DATABASE_DRIVER=${DATABASE_DRIVER:-"org.postgresql.Driver"} -export DATABASE_HOST=${DATABASE_HOST:-"127.0.0.1"} -export DATABASE_PORT=${DATABASE_PORT:-"5432"} -export DATABASE_USERNAME=${DATABASE_USERNAME:-"root"} -export DATABASE_PASSWORD=${DATABASE_PASSWORD:-"root"} -export DATABASE_DATABASE=${DATABASE_DATABASE:-"dolphinscheduler"} -export DATABASE_PARAMS=${DATABASE_PARAMS:-"characterEncoding=utf8"} +[ "h2" == ${DATABASE_TYPE} ] || export DATABASE_TYPE=${DATABASE_TYPE:-"postgresql"} +# export DATABASE_DRIVER=${DATABASE_DRIVER:-"org.postgresql.Driver"} +[ "h2" == ${DATABASE_TYPE} ] || export DATABASE_HOST=${DATABASE_HOST:-"127.0.0.1"} +[ "h2" == ${DATABASE_TYPE} ] || export DATABASE_PORT=${DATABASE_PORT:-"5432"} +[ "h2" == ${DATABASE_TYPE} ] || export DATABASE_USERNAME=${DATABASE_USERNAME:-"root"} +[ "h2" == ${DATABASE_TYPE} ] || export DATABASE_PASSWORD=${DATABASE_PASSWORD:-"root"} +[ "h2" == ${DATABASE_TYPE} ] || export DATABASE_DATABASE=${DATABASE_DATABASE:-"dolphinscheduler"} +[ "h2" == ${DATABASE_TYPE} ] || export DATABASE_PARAMS=${DATABASE_PARAMS:-"characterEncoding=utf8"} +# transform params to SPRING_DATASOURCE_XXX +[ "h2" == ${DATABASE_TYPE} ] || export SPRING_DATASOURCE_URL="jdbc:${DATABASE_TYPE}://${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_DATABASE}?${DATABASE_PARAMS}" +[ "h2" == ${DATABASE_TYPE} ] || export SPRING_DATASOURCE_USERNAME=${DATABASE_USERNAME} +[ "h2" == ${DATABASE_TYPE} ] || export SPRING_DATASOURCE_PASSWORD=${DATABASE_PASSWORD} #============================================================================ # Registry