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 2020/05/14 08:48:32 UTC
[incubator-dolphinscheduler] branch dev updated (de3a81c -> e4ee7d1)
This is an automated email from the ASF dual-hosted git repository.
liwenhe pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from de3a81c support ali nail(ding talk) , issue:2458 (#2594)
new c687856 merge from dev-1.3.0
new 91c544f sql
new 459e40b Merge branch 'dev' into fix-e2e-docker
new 4024465 fix ,
new e4ee7d1 Merge pull request #2707 from khadgarmage/fix-e2e-docker
The 2752 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci_e2e.yml | 13 +-
.github/workflows/ci_ut.yml | 10 +-
{dockerfile => docker/build}/Dockerfile | 36 +-
{dockerfile => docker/build}/README.md | 6 +-
{dockerfile => docker/build}/README_zh_CN.md | 6 +-
{dockerfile => docker/build}/checkpoint.sh | 0
.../conf/dolphinscheduler/alert.properties.tpl | 0
.../application-api.properties.tpl | 0
.../conf/dolphinscheduler/common.properties.tpl | 0
.../dolphinscheduler/datasource.properties.tpl | 0
.../dolphinscheduler/env/dolphinscheduler_env.sh | 0
.../dolphinscheduler/logback/logback-alert.xml | 0
.../conf/dolphinscheduler/logback/logback-api.xml | 0
.../dolphinscheduler/logback/logback-master.xml | 0
.../dolphinscheduler/logback/logback-worker.xml | 0
.../conf/dolphinscheduler/master.properties.tpl | 0
.../conf/dolphinscheduler/quartz.properties.tpl | 0
.../conf/dolphinscheduler/worker.properties.tpl | 0
.../conf/dolphinscheduler/zookeeper.properties.tpl | 0
.../build}/conf/nginx/dolphinscheduler.conf | 0
.../build}/conf/zookeeper/zoo.cfg | 0
{dockerfile => docker/build}/hooks/build | 14 +-
{dockerfile => docker/build}/hooks/build.bat | 12 +-
{dockerfile => docker/build}/hooks/push | 0
{dockerfile => docker/build}/hooks/push.bat | 0
{dockerfile => docker/build}/startup-init-conf.sh | 0
{dockerfile => docker/build}/startup.sh | 53 +-
docker/docker-compose.yml | 40 --
{dockerfile/hooks => docker/docker-swarm}/check | 2 +-
docker/docker-swarm/docker-compose.yml | 47 +-
docker/docker-swarm/docker-stack.yml | 27 +-
docker/kubernetes/dolphinscheduler/values.yaml | 6 +-
docker/postgres/docker-entrypoint-initdb/init.sql | 763 ---------------------
script/scp-hosts.sh | 11 +
script/start-all.sh | 3 +-
script/stop-all.sh | 3 +-
sql/dolphinscheduler-postgre.sql | 3 +-
sql/dolphinscheduler_mysql.sql | 1 +
38 files changed, 109 insertions(+), 947 deletions(-)
rename {dockerfile => docker/build}/Dockerfile (74%)
rename {dockerfile => docker/build}/README.md (98%)
rename {dockerfile => docker/build}/README_zh_CN.md (97%)
rename {dockerfile => docker/build}/checkpoint.sh (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/alert.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/application-api.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/common.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/datasource.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/env/dolphinscheduler_env.sh (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/logback/logback-alert.xml (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/logback/logback-api.xml (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/logback/logback-master.xml (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/logback/logback-worker.xml (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/master.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/quartz.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/worker.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/dolphinscheduler/zookeeper.properties.tpl (100%)
rename {dockerfile => docker/build}/conf/nginx/dolphinscheduler.conf (100%)
rename {dockerfile => docker/build}/conf/zookeeper/zoo.cfg (100%)
rename {dockerfile => docker/build}/hooks/build (74%)
rename {dockerfile => docker/build}/hooks/build.bat (91%)
rename {dockerfile => docker/build}/hooks/push (100%)
rename {dockerfile => docker/build}/hooks/push.bat (100%)
rename {dockerfile => docker/build}/startup-init-conf.sh (100%)
rename {dockerfile => docker/build}/startup.sh (75%)
delete mode 100644 docker/docker-compose.yml
rename {dockerfile/hooks => docker/docker-swarm}/check (85%)
delete mode 100755 docker/postgres/docker-entrypoint-initdb/init.sql