Browse Source

migrate docker composer and move dockerfile dir to docker/build

pull/3/MERGE
xiaochun.liu 4 years ago
parent
commit
e35e4c0dd5
  1. 4
      .github/workflows/ci_ut.yml
  2. 0
      docker/build/Dockerfile
  3. 0
      docker/build/README.md
  4. 0
      docker/build/README_zh_CN.md
  5. 0
      docker/build/checkpoint.sh
  6. 0
      docker/build/conf/dolphinscheduler/alert.properties.tpl
  7. 0
      docker/build/conf/dolphinscheduler/application-api.properties.tpl
  8. 0
      docker/build/conf/dolphinscheduler/common.properties.tpl
  9. 0
      docker/build/conf/dolphinscheduler/datasource.properties.tpl
  10. 0
      docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
  11. 0
      docker/build/conf/dolphinscheduler/logback/logback-alert.xml
  12. 0
      docker/build/conf/dolphinscheduler/logback/logback-api.xml
  13. 0
      docker/build/conf/dolphinscheduler/logback/logback-master.xml
  14. 0
      docker/build/conf/dolphinscheduler/logback/logback-worker.xml
  15. 0
      docker/build/conf/dolphinscheduler/master.properties.tpl
  16. 0
      docker/build/conf/dolphinscheduler/quartz.properties.tpl
  17. 0
      docker/build/conf/dolphinscheduler/worker.properties.tpl
  18. 0
      docker/build/conf/dolphinscheduler/zookeeper.properties.tpl
  19. 0
      docker/build/conf/nginx/dolphinscheduler.conf
  20. 0
      docker/build/conf/zookeeper/zoo.cfg
  21. 0
      docker/build/hooks/build
  22. 0
      docker/build/hooks/build.bat
  23. 0
      docker/build/hooks/push
  24. 0
      docker/build/hooks/push.bat
  25. 0
      docker/build/startup-init-conf.sh
  26. 0
      docker/build/startup.sh

4
.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:

0
dockerfile/Dockerfile → docker/build/Dockerfile

0
dockerfile/README.md → docker/build/README.md

0
dockerfile/README_zh_CN.md → docker/build/README_zh_CN.md

0
dockerfile/checkpoint.sh → docker/build/checkpoint.sh

0
dockerfile/conf/dolphinscheduler/alert.properties.tpl → docker/build/conf/dolphinscheduler/alert.properties.tpl

0
dockerfile/conf/dolphinscheduler/application-api.properties.tpl → docker/build/conf/dolphinscheduler/application-api.properties.tpl

0
dockerfile/conf/dolphinscheduler/common.properties.tpl → docker/build/conf/dolphinscheduler/common.properties.tpl

0
dockerfile/conf/dolphinscheduler/datasource.properties.tpl → docker/build/conf/dolphinscheduler/datasource.properties.tpl

0
dockerfile/conf/dolphinscheduler/env/dolphinscheduler_env.sh → docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh vendored

0
dockerfile/conf/dolphinscheduler/logback/logback-alert.xml → docker/build/conf/dolphinscheduler/logback/logback-alert.xml

0
dockerfile/conf/dolphinscheduler/logback/logback-api.xml → docker/build/conf/dolphinscheduler/logback/logback-api.xml

0
dockerfile/conf/dolphinscheduler/logback/logback-master.xml → docker/build/conf/dolphinscheduler/logback/logback-master.xml

0
dockerfile/conf/dolphinscheduler/logback/logback-worker.xml → docker/build/conf/dolphinscheduler/logback/logback-worker.xml

0
dockerfile/conf/dolphinscheduler/master.properties.tpl → docker/build/conf/dolphinscheduler/master.properties.tpl

0
dockerfile/conf/dolphinscheduler/quartz.properties.tpl → docker/build/conf/dolphinscheduler/quartz.properties.tpl

0
dockerfile/conf/dolphinscheduler/worker.properties.tpl → docker/build/conf/dolphinscheduler/worker.properties.tpl

0
dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl → docker/build/conf/dolphinscheduler/zookeeper.properties.tpl

0
dockerfile/conf/nginx/dolphinscheduler.conf → docker/build/conf/nginx/dolphinscheduler.conf

0
dockerfile/conf/zookeeper/zoo.cfg → docker/build/conf/zookeeper/zoo.cfg

0
dockerfile/hooks/build → docker/build/hooks/build

0
dockerfile/hooks/build.bat → docker/build/hooks/build.bat

0
dockerfile/hooks/push → docker/build/hooks/push

0
dockerfile/hooks/push.bat → docker/build/hooks/push.bat

0
dockerfile/startup-init-conf.sh → docker/build/startup-init-conf.sh

0
dockerfile/startup.sh → docker/build/startup.sh

Loading…
Cancel
Save