Merge branch 'main' of ssh://gitlab.jafner.net:2229/Jafner/homelab

This commit is contained in:
Joey Hafner 2022-02-25 21:19:03 -08:00
commit e07b0953d2
2 changed files with 4 additions and 4 deletions

View File

@ -17,9 +17,11 @@ docker-compose-test:
stage: test stage: test
rules: rules:
- changes: - changes:
- docker-compose.yml - seedbox/config/
- server/config/minecraft/ - server/config/
- jafner-tools/config/
script: script:
- git pull
- find ~+ -type f -name docker-compose.yml > composes.txt - find ~+ -type f -name docker-compose.yml > composes.txt
- find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt
- for file in `cat composes.txt`; do docker-compose -f $file config; done - for file in `cat composes.txt`; do docker-compose -f $file config; done

View File

@ -15,5 +15,3 @@ services:
- $DOCKER_DATA:/config - $DOCKER_DATA:/config
- /mnt/torrenting/GGN/0:/downloads - /mnt/torrenting/GGN/0:/downloads
- /mnt/torrenting/GGN/0T:/watch - /mnt/torrenting/GGN/0T:/watch
# this is a meaningless comment to test the ci/cd pipeline