From fb2b55c150c3d1f116d6723a767f9f2e3239378a Mon Sep 17 00:00:00 2001 From: chengshiwen Date: Fri, 5 Mar 2021 15:14:34 +0800 Subject: [PATCH] [Improvement][Docker] Improve readme, notes, and long host display --- docker/README.md | 2 +- docker/build/README.md | 2 +- docker/build/README_zh_CN.md | 2 +- docker/build/startup-init-conf.sh | 4 ++-- docker/kubernetes/dolphinscheduler/README.md | 2 +- docker/kubernetes/dolphinscheduler/templates/NOTES.txt | 2 +- docker/kubernetes/dolphinscheduler/values.yaml | 6 +++--- .../projects/pages/instance/pages/list/_source/list.vue | 2 +- .../home/pages/projects/pages/taskInstance/_source/list.vue | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/README.md b/docker/README.md index dcd20981be..05c74f3a99 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1 +1 @@ -# Dolphin Scheduler for Docker +# DolphinScheduler for Docker diff --git a/docker/build/README.md b/docker/build/README.md index 6612307445..92cb50ed9a 100644 --- a/docker/build/README.md +++ b/docker/build/README.md @@ -332,7 +332,7 @@ server.port=${API_SERVER_PORT} `/root/start-init-conf.sh` will dynamically generate config file: ```sh -echo "generate app config" +echo "generate dolphinscheduler config" ls ${DOLPHINSCHEDULER_HOME}/conf/ | grep ".tpl" | while read line; do eval "cat << EOF $(cat ${DOLPHINSCHEDULER_HOME}/conf/${line}) diff --git a/docker/build/README_zh_CN.md b/docker/build/README_zh_CN.md index 311c53c02d..e2d25c86a6 100644 --- a/docker/build/README_zh_CN.md +++ b/docker/build/README_zh_CN.md @@ -332,7 +332,7 @@ server.port=${API_SERVER_PORT} `/root/start-init-conf.sh`将根据模板文件动态的生成配置文件： ```sh -echo "generate app config" +echo "generate dolphinscheduler config" ls ${DOLPHINSCHEDULER_HOME}/conf/ | grep ".tpl" | while read line; do eval "cat << EOF $(cat ${DOLPHINSCHEDULER_HOME}/conf/${line}) diff --git a/docker/build/startup-init-conf.sh b/docker/build/startup-init-conf.sh index c4109dd0f2..3d0eb4a31b 100755 --- a/docker/build/startup-init-conf.sh +++ b/docker/build/startup-init-conf.sh @@ -25,13 +25,13 @@ echo "init env variables" #============================================================================ # Database Source #============================================================================ +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_TYPE=${DATABASE_TYPE:-"postgresql"} -export DATABASE_DRIVER=${DATABASE_DRIVER:-"org.postgresql.Driver"} export DATABASE_PARAMS=${DATABASE_PARAMS:-"characterEncoding=utf8"} #============================================================================ diff --git a/docker/kubernetes/dolphinscheduler/README.md b/docker/kubernetes/dolphinscheduler/README.md index 05bf24e89a..57e41a0b97 100644 --- a/docker/kubernetes/dolphinscheduler/README.md +++ b/docker/kubernetes/dolphinscheduler/README.md @@ -82,7 +82,7 @@ The Configuration file is `values.yaml`, and the following tables lists the conf | `fullnameOverride` | String to fully override common.names.fullname | `nil` | | `timezone` | World time and date for cities in all time zones | `Asia/Shanghai` | | `image.registry` | Docker image registry for the DolphinScheduler | `docker.io` | -| `image.repository` | Docker image repository for the DolphinScheduler | `dolphinscheduler` | +| `image.repository` | Docker image repository for the DolphinScheduler | `apache/dolphinscheduler` | | `image.tag` | Docker image version for the DolphinScheduler | `latest` | | `image.pullPolicy` | Image pull policy. One of Always, Never, IfNotPresent | `IfNotPresent` | | `image.pullSecrets` | Image pull secrets. An optional list of references to secrets in the same namespace to use for pulling any of the images | `[]` | diff --git a/docker/kubernetes/dolphinscheduler/templates/NOTES.txt b/docker/kubernetes/dolphinscheduler/templates/NOTES.txt index 6e2800a9cc..81a30d5677 100644 --- a/docker/kubernetes/dolphinscheduler/templates/NOTES.txt +++ b/docker/kubernetes/dolphinscheduler/templates/NOTES.txt @@ -29,4 +29,4 @@ Access DolphinScheduler by: DolphinScheduler URL: http://127.0.0.1:12345/dolphinscheduler -{{- end }} +{{- end }} \ No newline at end of file diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml index 88f0a395cc..071e7fb2bd 100644 --- a/docker/kubernetes/dolphinscheduler/values.yaml +++ b/docker/kubernetes/dolphinscheduler/values.yaml @@ -25,8 +25,8 @@ fullnameOverride: "" timezone: "Asia/Shanghai" image: - registry: "apache" - repository: "dolphinscheduler" + registry: "docker.io" + repository: "apache/dolphinscheduler" tag: "latest" pullPolicy: "IfNotPresent" pullSecrets: [] @@ -58,7 +58,7 @@ externalDatabase: ## If not exists external zookeeper, by default, Dolphinscheduler's zookeeper will use it. zookeeper: enabled: true - fourlwCommandsWhitelist: srvr,ruok,wchs,cons + fourlwCommandsWhitelist: "srvr,ruok,wchs,cons" service: port: "2181" persistence: diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue index 554654e4cb..cbd5626c0a 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue @@ -64,7 +64,7 @@ - + - +