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

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


    from 29a353e  Using docker/docker-swarm/docker-compose.yml to run pg and zk 
in ci_ut.yml (#2692)
     new e35e4c0  migrate docker composer and move dockerfile dir to 
docker/build
     new 39a281c  ut docker
     new c1215ad  alter dockerfile to docker/build dir
     new 9052dad  delete docker-compose old
     new 27221d7  delete dockerfile zk
     new 31d05e7  delete dockerfile zk
     new 0d45372  delete dockerfile zk
     new b9bc052  merge from dev1.3.0
     new 247830a  Merge pull request #2683 from 
khadgarmage/feature/docker_for_release

The 2782 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                       |   2 +-
 {dockerfile => docker/build}/Dockerfile            |   3 +-
 {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           |  10 +-
 {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            |   0
 docker/docker-compose.yml                          |  40 --
 docker/postgres/docker-entrypoint-initdb/init.sql  | 762 ---------------------
 28 files changed, 19 insertions(+), 822 deletions(-)
 rename {dockerfile => docker/build}/Dockerfile (98%)
 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 (89%)
 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 (100%)
 delete mode 100644 docker/docker-compose.yml
 delete mode 100755 docker/postgres/docker-entrypoint-initdb/init.sql

Reply via email to