You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2021/02/23 06:47:59 UTC

[incubator-dolphinscheduler] branch dev updated (668ef64 -> 149b0da)

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.


    from 668ef64  [Improvement][readme] fix readme.md broken link (#4825)
     add 149b0da  [Improvement][Docker] Sync docker conf templates to the latest conf properties (#4772)

No new revisions were added by this update.

Summary of changes:
 docker/README.md                                   |  1 +
 docker/build/Dockerfile                            |  2 +-
 .../conf/dolphinscheduler/alert.properties.tpl     | 46 ++++-----------
 .../application-api.properties.tpl                 | 27 +++++++--
 .../conf/dolphinscheduler/common.properties.tpl    | 66 +++++++++++-----------
 .../dolphinscheduler/datasource.properties.tpl     | 17 ++++--
 .../conf/dolphinscheduler/logback/logback-api.xml  |  4 +-
 .../dolphinscheduler/logback/logback-master.xml    |  4 +-
 .../dolphinscheduler/logback/logback-worker.xml    |  9 ++-
 .../conf/dolphinscheduler/master.properties.tpl    |  5 +-
 .../conf/dolphinscheduler/quartz.properties.tpl    |  2 +-
 .../conf/dolphinscheduler/worker.properties.tpl    | 14 ++---
 .../conf/dolphinscheduler/zookeeper.properties.tpl |  3 +-
 docker/build/startup-init-conf.sh                  | 27 ++-------
 docker/build/startup.sh                            | 38 +++++++++++--
 docker/docker-swarm/docker-compose.yml             | 28 ++-------
 docker/docker-swarm/docker-stack.yml               | 28 ++-------
 .../src/main/resources/alert.properties            |  2 -
 .../src/main/resources/application-api.properties  | 10 ++--
 .../src/main/resources/logback-api.xml             |  4 +-
 .../src/main/resources/common.properties           | 13 +++--
 .../src/main/resources/master.properties           |  6 +-
 .../src/main/resources/worker.properties           |  2 +-
 .../src/main/resources/logback-zookeeper.xml       |  2 +-
 .../src/main/resources/quartz.properties           |  2 +-
 .../src/main/resources/zookeeper.properties        |  2 +-
 26 files changed, 169 insertions(+), 195 deletions(-)