From e35e4c0dd5e84303d4a6ebdf052368b029d65886 Mon Sep 17 00:00:00 2001 From: "xiaochun.liu" Date: Tue, 12 May 2020 00:05:36 +0800 Subject: [PATCH] migrate docker composer and move dockerfile dir to docker/build --- .github/workflows/ci_ut.yml | 4 +++- {dockerfile => docker/build}/Dockerfile | 0 {dockerfile => docker/build}/README.md | 0 {dockerfile => docker/build}/README_zh_CN.md | 0 {dockerfile => docker/build}/checkpoint.sh | 0 .../build}/conf/dolphinscheduler/alert.properties.tpl | 0 .../conf/dolphinscheduler/application-api.properties.tpl | 0 .../build}/conf/dolphinscheduler/common.properties.tpl | 0 .../build}/conf/dolphinscheduler/datasource.properties.tpl | 0 .../build}/conf/dolphinscheduler/env/dolphinscheduler_env.sh | 0 .../build}/conf/dolphinscheduler/logback/logback-alert.xml | 0 .../build}/conf/dolphinscheduler/logback/logback-api.xml | 0 .../build}/conf/dolphinscheduler/logback/logback-master.xml | 0 .../build}/conf/dolphinscheduler/logback/logback-worker.xml | 0 .../build}/conf/dolphinscheduler/master.properties.tpl | 0 .../build}/conf/dolphinscheduler/quartz.properties.tpl | 0 .../build}/conf/dolphinscheduler/worker.properties.tpl | 0 .../build}/conf/dolphinscheduler/zookeeper.properties.tpl | 0 {dockerfile => docker/build}/conf/nginx/dolphinscheduler.conf | 0 {dockerfile => docker/build}/conf/zookeeper/zoo.cfg | 0 {dockerfile => docker/build}/hooks/build | 0 {dockerfile => docker/build}/hooks/build.bat | 0 {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 26 files changed, 3 insertions(+), 1 deletion(-) rename {dockerfile => docker/build}/Dockerfile (100%) rename {dockerfile => docker/build}/README.md (100%) rename {dockerfile => docker/build}/README_zh_CN.md (100%) 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 (100%) rename {dockerfile => docker/build}/hooks/build.bat (100%) 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%) diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/ci_ut.yml index 6d0b2a2a1d..e6532c606f 100644 --- 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: diff --git a/dockerfile/Dockerfile b/docker/build/Dockerfile similarity index 100% rename from dockerfile/Dockerfile rename to docker/build/Dockerfile diff --git a/dockerfile/README.md b/docker/build/README.md similarity index 100% rename from dockerfile/README.md rename to docker/build/README.md diff --git a/dockerfile/README_zh_CN.md b/docker/build/README_zh_CN.md similarity index 100% rename from dockerfile/README_zh_CN.md rename to docker/build/README_zh_CN.md diff --git a/dockerfile/checkpoint.sh b/docker/build/checkpoint.sh similarity index 100% rename from dockerfile/checkpoint.sh rename to docker/build/checkpoint.sh diff --git a/dockerfile/conf/dolphinscheduler/alert.properties.tpl b/docker/build/conf/dolphinscheduler/alert.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/alert.properties.tpl rename to docker/build/conf/dolphinscheduler/alert.properties.tpl diff --git a/dockerfile/conf/dolphinscheduler/application-api.properties.tpl b/docker/build/conf/dolphinscheduler/application-api.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/application-api.properties.tpl rename to docker/build/conf/dolphinscheduler/application-api.properties.tpl diff --git a/dockerfile/conf/dolphinscheduler/common.properties.tpl b/docker/build/conf/dolphinscheduler/common.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/common.properties.tpl rename to docker/build/conf/dolphinscheduler/common.properties.tpl diff --git a/dockerfile/conf/dolphinscheduler/datasource.properties.tpl b/docker/build/conf/dolphinscheduler/datasource.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/datasource.properties.tpl rename to docker/build/conf/dolphinscheduler/datasource.properties.tpl diff --git a/dockerfile/conf/dolphinscheduler/env/dolphinscheduler_env.sh b/docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh similarity index 100% rename from dockerfile/conf/dolphinscheduler/env/dolphinscheduler_env.sh rename to docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh diff --git a/dockerfile/conf/dolphinscheduler/logback/logback-alert.xml b/docker/build/conf/dolphinscheduler/logback/logback-alert.xml similarity index 100% rename from dockerfile/conf/dolphinscheduler/logback/logback-alert.xml rename to docker/build/conf/dolphinscheduler/logback/logback-alert.xml diff --git a/dockerfile/conf/dolphinscheduler/logback/logback-api.xml b/docker/build/conf/dolphinscheduler/logback/logback-api.xml similarity index 100% rename from dockerfile/conf/dolphinscheduler/logback/logback-api.xml rename to docker/build/conf/dolphinscheduler/logback/logback-api.xml diff --git a/dockerfile/conf/dolphinscheduler/logback/logback-master.xml b/docker/build/conf/dolphinscheduler/logback/logback-master.xml similarity index 100% rename from dockerfile/conf/dolphinscheduler/logback/logback-master.xml rename to docker/build/conf/dolphinscheduler/logback/logback-master.xml diff --git a/dockerfile/conf/dolphinscheduler/logback/logback-worker.xml b/docker/build/conf/dolphinscheduler/logback/logback-worker.xml similarity index 100% rename from dockerfile/conf/dolphinscheduler/logback/logback-worker.xml rename to docker/build/conf/dolphinscheduler/logback/logback-worker.xml diff --git a/dockerfile/conf/dolphinscheduler/master.properties.tpl b/docker/build/conf/dolphinscheduler/master.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/master.properties.tpl rename to docker/build/conf/dolphinscheduler/master.properties.tpl diff --git a/dockerfile/conf/dolphinscheduler/quartz.properties.tpl b/docker/build/conf/dolphinscheduler/quartz.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/quartz.properties.tpl rename to docker/build/conf/dolphinscheduler/quartz.properties.tpl diff --git a/dockerfile/conf/dolphinscheduler/worker.properties.tpl b/docker/build/conf/dolphinscheduler/worker.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/worker.properties.tpl rename to docker/build/conf/dolphinscheduler/worker.properties.tpl diff --git a/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl b/docker/build/conf/dolphinscheduler/zookeeper.properties.tpl similarity index 100% rename from dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl rename to docker/build/conf/dolphinscheduler/zookeeper.properties.tpl diff --git a/dockerfile/conf/nginx/dolphinscheduler.conf b/docker/build/conf/nginx/dolphinscheduler.conf similarity index 100% rename from dockerfile/conf/nginx/dolphinscheduler.conf rename to docker/build/conf/nginx/dolphinscheduler.conf diff --git a/dockerfile/conf/zookeeper/zoo.cfg b/docker/build/conf/zookeeper/zoo.cfg similarity index 100% rename from dockerfile/conf/zookeeper/zoo.cfg rename to docker/build/conf/zookeeper/zoo.cfg diff --git a/dockerfile/hooks/build b/docker/build/hooks/build similarity index 100% rename from dockerfile/hooks/build rename to docker/build/hooks/build diff --git a/dockerfile/hooks/build.bat b/docker/build/hooks/build.bat similarity index 100% rename from dockerfile/hooks/build.bat rename to docker/build/hooks/build.bat diff --git a/dockerfile/hooks/push b/docker/build/hooks/push similarity index 100% rename from dockerfile/hooks/push rename to docker/build/hooks/push diff --git a/dockerfile/hooks/push.bat b/docker/build/hooks/push.bat similarity index 100% rename from dockerfile/hooks/push.bat rename to docker/build/hooks/push.bat diff --git a/dockerfile/startup-init-conf.sh b/docker/build/startup-init-conf.sh similarity index 100% rename from dockerfile/startup-init-conf.sh rename to docker/build/startup-init-conf.sh diff --git a/dockerfile/startup.sh b/docker/build/startup.sh similarity index 100% rename from dockerfile/startup.sh rename to docker/build/startup.sh