You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/11/30 08:00:16 UTC
[dolphinscheduler] branch 2.0.1-prepare updated: [2.0.1-cherrypick] [#7007]transform params to SPRING_DATASOURCE_XXX (#7067)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 2.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.1-prepare by this push:
new 9283ee2 [2.0.1-cherrypick] [#7007]transform params to SPRING_DATASOURCE_XXX (#7067)
9283ee2 is described below
commit 9283ee2bdfdcdec94c9ba53d6e28a405e029ed67
Author: Kirs <ac...@163.com>
AuthorDate: Tue Nov 30 16:00:10 2021 +0800
[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 <zw...@163.com>
---
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 23f5cff..32b71bf 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