migrate docker composer and move dockerfile dir to docker/build

5 years ago · e35e4c0dd5
26 changed files with 3 additions and 1 deletions
--- 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/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
--- a/docker/build/README.md
+++ b/docker/build/README.md
--- a/docker/build/README_zh_CN.md
+++ b/docker/build/README_zh_CN.md
--- a/docker/build/checkpoint.sh
+++ b/docker/build/checkpoint.sh
--- a/docker/build/conf/dolphinscheduler/alert.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/alert.properties.tpl
--- a/docker/build/conf/dolphinscheduler/application-api.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/application-api.properties.tpl
--- a/docker/build/conf/dolphinscheduler/common.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/common.properties.tpl
--- a/docker/build/conf/dolphinscheduler/datasource.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/datasource.properties.tpl
--- a/docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
+++ b/docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
--- a/docker/build/conf/dolphinscheduler/logback/logback-alert.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-alert.xml
--- a/docker/build/conf/dolphinscheduler/logback/logback-api.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-api.xml
--- a/docker/build/conf/dolphinscheduler/logback/logback-master.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-master.xml
--- a/docker/build/conf/dolphinscheduler/logback/logback-worker.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-worker.xml
--- a/docker/build/conf/dolphinscheduler/master.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/master.properties.tpl
--- a/docker/build/conf/dolphinscheduler/quartz.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/quartz.properties.tpl
--- a/docker/build/conf/dolphinscheduler/worker.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/worker.properties.tpl
--- a/docker/build/conf/dolphinscheduler/zookeeper.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/zookeeper.properties.tpl
--- a/docker/build/conf/nginx/dolphinscheduler.conf
+++ b/docker/build/conf/nginx/dolphinscheduler.conf
--- a/docker/build/conf/zookeeper/zoo.cfg
+++ b/docker/build/conf/zookeeper/zoo.cfg
--- a/docker/build/hooks/build
+++ b/docker/build/hooks/build
--- a/docker/build/hooks/build.bat
+++ b/docker/build/hooks/build.bat
--- a/docker/build/hooks/push
+++ b/docker/build/hooks/push
--- a/docker/build/hooks/push.bat
+++ b/docker/build/hooks/push.bat
--- a/docker/build/startup-init-conf.sh
+++ b/docker/build/startup-init-conf.sh
--- a/docker/build/startup.sh
+++ b/docker/build/startup.sh