migrate docker composer and move dockerfile dir to docker/build

e35e4c0d · xiaochun.liu · 3c014c5a · e35e4c0d · e35e4c0d · e35e4c0d
26 changed file
--- a/.github/workflows/ci_ut.yml
+++ b/.github/workflows/ci_ut.yml
@@ -47,7 +47,9 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-maven-
      - name: Bootstrap database
-        run: cd ${DOCKER_DIR} && docker-compose up -d
+        run: |
+          sed -i "s/: root/: test/g" $(pwd)/docker/docker-swarm/docker-compose.yml
+          docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml up dolphinscheduler-zookeeper dolphinscheduler-postgresql -d
      - name: Set up JDK 1.8
        uses: actions/setup-java@v1
        with:

--- a/dockerfile/Dockerfile
+++ b/dockerfile/Dockerfile
--- a/dockerfile/README.md
+++ b/dockerfile/README.md
--- a/dockerfile/README_zh_CN.md
+++ b/dockerfile/README_zh_CN.md
--- a/dockerfile/checkpoint.sh
+++ b/dockerfile/checkpoint.sh
--- a/dockerfile/conf/dolphinscheduler/alert.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/alert.properties.tpl
--- a/dockerfile/conf/dolphinscheduler/application-api.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/application-api.properties.tpl
--- a/dockerfile/conf/dolphinscheduler/common.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/common.properties.tpl
--- a/dockerfile/conf/dolphinscheduler/datasource.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/datasource.properties.tpl
--- a/dockerfile/conf/dolphinscheduler/env/dolphinscheduler_env.sh
+++ b/dockerfile/conf/dolphinscheduler/env/dolphinscheduler_env.sh
--- a/dockerfile/conf/dolphinscheduler/logback/logback-alert.xml
+++ b/dockerfile/conf/dolphinscheduler/logback/logback-alert.xml
--- a/dockerfile/conf/dolphinscheduler/logback/logback-api.xml
+++ b/dockerfile/conf/dolphinscheduler/logback/logback-api.xml
--- a/dockerfile/conf/dolphinscheduler/logback/logback-master.xml
+++ b/dockerfile/conf/dolphinscheduler/logback/logback-master.xml
--- a/dockerfile/conf/dolphinscheduler/logback/logback-worker.xml
+++ b/dockerfile/conf/dolphinscheduler/logback/logback-worker.xml
--- a/dockerfile/conf/dolphinscheduler/master.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/master.properties.tpl
--- a/dockerfile/conf/dolphinscheduler/quartz.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/quartz.properties.tpl
--- a/dockerfile/conf/dolphinscheduler/worker.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/worker.properties.tpl
--- a/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl
+++ b/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl
--- a/dockerfile/conf/nginx/dolphinscheduler.conf
+++ b/dockerfile/conf/nginx/dolphinscheduler.conf
--- a/dockerfile/conf/zookeeper/zoo.cfg
+++ b/dockerfile/conf/zookeeper/zoo.cfg
--- a/dockerfile/hooks/build
+++ b/dockerfile/hooks/build
--- a/dockerfile/hooks/build.bat
+++ b/dockerfile/hooks/build.bat
--- a/dockerfile/hooks/push
+++ b/dockerfile/hooks/push
--- a/dockerfile/hooks/push.bat
+++ b/dockerfile/hooks/push.bat
--- a/dockerfile/startup-init-conf.sh
+++ b/dockerfile/startup-init-conf.sh
--- a/dockerfile/startup.sh
+++ b/dockerfile/startup.sh