Browse Source

Merge pull request #4962 from chengshiwen/improve-docker-readme

[Improvement][Docker] Improve readme, notes, and long host display
pull/3/MERGE
xingchun-chen 4 years ago committed by GitHub
parent
commit
e851ec1367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      docker/README.md
  2. 2
      docker/build/README.md
  3. 2
      docker/build/README_zh_CN.md
  4. 4
      docker/build/startup-init-conf.sh
  5. 2
      docker/kubernetes/dolphinscheduler/README.md
  6. 6
      docker/kubernetes/dolphinscheduler/values.yaml
  7. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  8. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

2
docker/README.md

@ -1 +1 @@
# Dolphin Scheduler for Docker # DolphinScheduler for Docker

2
docker/build/README.md

@ -332,7 +332,7 @@ server.port=${API_SERVER_PORT}
`/root/start-init-conf.sh` will dynamically generate config file: `/root/start-init-conf.sh` will dynamically generate config file:
```sh ```sh
echo "generate app config" echo "generate dolphinscheduler config"
ls ${DOLPHINSCHEDULER_HOME}/conf/ | grep ".tpl" | while read line; do ls ${DOLPHINSCHEDULER_HOME}/conf/ | grep ".tpl" | while read line; do
eval "cat << EOF eval "cat << EOF
$(cat ${DOLPHINSCHEDULER_HOME}/conf/${line}) $(cat ${DOLPHINSCHEDULER_HOME}/conf/${line})

2
docker/build/README_zh_CN.md

@ -332,7 +332,7 @@ server.port=${API_SERVER_PORT}
`/root/start-init-conf.sh`将根据模板文件动态的生成配置文件: `/root/start-init-conf.sh`将根据模板文件动态的生成配置文件:
```sh ```sh
echo "generate app config" echo "generate dolphinscheduler config"
ls ${DOLPHINSCHEDULER_HOME}/conf/ | grep ".tpl" | while read line; do ls ${DOLPHINSCHEDULER_HOME}/conf/ | grep ".tpl" | while read line; do
eval "cat << EOF eval "cat << EOF
$(cat ${DOLPHINSCHEDULER_HOME}/conf/${line}) $(cat ${DOLPHINSCHEDULER_HOME}/conf/${line})

4
docker/build/startup-init-conf.sh

@ -25,13 +25,13 @@ echo "init env variables"
#============================================================================ #============================================================================
# Database Source # 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_HOST=${DATABASE_HOST:-"127.0.0.1"}
export DATABASE_PORT=${DATABASE_PORT:-"5432"} export DATABASE_PORT=${DATABASE_PORT:-"5432"}
export DATABASE_USERNAME=${DATABASE_USERNAME:-"root"} export DATABASE_USERNAME=${DATABASE_USERNAME:-"root"}
export DATABASE_PASSWORD=${DATABASE_PASSWORD:-"root"} export DATABASE_PASSWORD=${DATABASE_PASSWORD:-"root"}
export DATABASE_DATABASE=${DATABASE_DATABASE:-"dolphinscheduler"} 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"} export DATABASE_PARAMS=${DATABASE_PARAMS:-"characterEncoding=utf8"}
#============================================================================ #============================================================================

2
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` | | `fullnameOverride` | String to fully override common.names.fullname | `nil` |
| `timezone` | World time and date for cities in all time zones | `Asia/Shanghai` | | `timezone` | World time and date for cities in all time zones | `Asia/Shanghai` |
| `image.registry` | Docker image registry for the DolphinScheduler | `docker.io` | | `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.tag` | Docker image version for the DolphinScheduler | `latest` |
| `image.pullPolicy` | Image pull policy. One of Always, Never, IfNotPresent | `IfNotPresent` | | `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 | `[]` | | `image.pullSecrets` | Image pull secrets. An optional list of references to secrets in the same namespace to use for pulling any of the images | `[]` |

6
docker/kubernetes/dolphinscheduler/values.yaml

@ -25,8 +25,8 @@ fullnameOverride: ""
timezone: "Asia/Shanghai" timezone: "Asia/Shanghai"
image: image:
registry: "apache" registry: "docker.io"
repository: "dolphinscheduler" repository: "apache/dolphinscheduler"
tag: "latest" tag: "latest"
pullPolicy: "IfNotPresent" pullPolicy: "IfNotPresent"
pullSecrets: [] pullSecrets: []
@ -58,7 +58,7 @@ externalDatabase:
## If not exists external zookeeper, by default, Dolphinscheduler's zookeeper will use it. ## If not exists external zookeeper, by default, Dolphinscheduler's zookeeper will use it.
zookeeper: zookeeper:
enabled: true enabled: true
fourlwCommandsWhitelist: srvr,ruok,wchs,cons fourlwCommandsWhitelist: "srvr,ruok,wchs,cons"
service: service:
port: "2181" port: "2181"
persistence: persistence:

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@ -64,7 +64,7 @@
<el-table-column prop="runTimes" :label="$t('Run Times')"></el-table-column> <el-table-column prop="runTimes" :label="$t('Run Times')"></el-table-column>
<el-table-column prop="recovery" :label="$t('fault-tolerant sign')"></el-table-column> <el-table-column prop="recovery" :label="$t('fault-tolerant sign')"></el-table-column>
<el-table-column prop="executorName" :label="$t('Executor')"></el-table-column> <el-table-column prop="executorName" :label="$t('Executor')"></el-table-column>
<el-table-column prop="host" :label="$t('host')" width="150"></el-table-column> <el-table-column prop="host" :label="$t('host')" min-width="190"></el-table-column>
<el-table-column :label="$t('Operation')" width="240" fixed="right"> <el-table-column :label="$t('Operation')" width="240" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-show="scope.row.disabled"> <div v-show="scope.row.disabled">

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@ -59,7 +59,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="retryTimes" :label="$t('Retry Count')"></el-table-column> <el-table-column prop="retryTimes" :label="$t('Retry Count')"></el-table-column>
<el-table-column :label="$t('host')"> <el-table-column :label="$t('host')" min-width="190">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.host | filterNull}}</span> <span>{{scope.row.host | filterNull}}</span>
</template> </template>

Loading…
Cancel
Save