| Revision | 8382a64b49b2e176436315b92512becf512a6bbe (tree) |
|---|---|
| Zeit | 2018-05-06 12:24:02 |
| Autor | whitestar <whitestar@user...> |
| Commiter | whitestar |
fixes utility scripts.
cookbooks/docker-grid/CHANGELOG.md (diff) cookbooks/docker-grid/concourse.yml (diff) cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup (diff) cookbooks/docker-grid/templates/default/usr/local/bin/docker_images_cleanup (diff) cookbooks/docker-grid/templates/default/usr/local/bin/docker_volumes_cleanup (diff) cookbooks/docker-grid/version (diff)| @@ -1,5 +1,9 @@ | ||
| 1 | 1 | # docker-grid CHANGELOG |
| 2 | 2 | |
| 3 | +0.5.9 | |
| 4 | +----- | |
| 5 | +- fixes utility scripts. | |
| 6 | + | |
| 3 | 7 | 0.5.8 |
| 4 | 8 | ----- |
| 5 | 9 | - improves utility scripts. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | --- |
| 2 | -# $ fly -t target sp -p docker-grid-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml | |
| 2 | +# $ fly -t $CC_TARGET sp -p docker-grid-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml | |
| 3 | 3 | resources: |
| 4 | 4 | - name: src-git |
| 5 | 5 | type: git |
| @@ -21,7 +21,7 @@ resources: | ||
| 21 | 21 | ca_certs: |
| 22 | 22 | - domain: ((registry-mirror-domain)) # e.g. registry.docker.example.com:5000 |
| 23 | 23 | cert: ((docker-reg-ca-cert)) |
| 24 | - check_every: 12h # default: 1m | |
| 24 | + check_every: 6h # default: 1m | |
| 25 | 25 | |
| 26 | 26 | jobs: |
| 27 | 27 | - name: test-cookbook |
| @@ -97,4 +97,4 @@ jobs: | ||
| 97 | 97 | tag_prefix: ((cookbook-name))- |
| 98 | 98 | tag: src-git/cookbooks/((cookbook-name))/version |
| 99 | 99 | only_tag: true |
| 100 | - annotate: ../src-git/cookbooks/((cookbook-name))/version | |
| 100 | + annotate: src-git/cookbooks/((cookbook-name))/version |
| @@ -8,4 +8,7 @@ if id $(whoami) | grep docker > /dev/null 2>&1; then | ||
| 8 | 8 | fi |
| 9 | 9 | [ `whoami` = 'root' ] && sudo='' |
| 10 | 10 | |
| 11 | -$sudo docker ps -q -f status=exited -f status=dead | awk '{print $1}' | xargs --no-run-if-empty docker rm | |
| 11 | +if ! tty -s; then | |
| 12 | + echo `date '+%Y-%m-%d %H:%M:%S %z'`' Removing exited and dead containers ...' | |
| 13 | +fi | |
| 14 | +$sudo docker ps -q -f status=exited -f status=dead | awk '{print $1}' | $sudo xargs --no-run-if-empty docker rm |
| @@ -8,4 +8,7 @@ if id $(whoami) | grep docker > /dev/null 2>&1; then | ||
| 8 | 8 | fi |
| 9 | 9 | [ `whoami` = 'root' ] && sudo='' |
| 10 | 10 | |
| 11 | -$sudo docker images | awk '$2=="<none>" {print $3}' | xargs --no-run-if-empty docker rmi | |
| 11 | +if ! tty -s; then | |
| 12 | + echo `date '+%Y-%m-%d %H:%M:%S %z'`' Removing untagged images ...' | |
| 13 | +fi | |
| 14 | +$sudo docker images | awk '$2=="<none>" {print $3}' | $sudo xargs --no-run-if-empty docker rmi |
| @@ -8,4 +8,7 @@ if id $(whoami) | grep docker > /dev/null 2>&1; then | ||
| 8 | 8 | fi |
| 9 | 9 | [ `whoami` = 'root' ] && sudo='' |
| 10 | 10 | |
| 11 | -$sudo docker volume ls -qf dangling=true | xargs --no-run-if-empty docker volume rm | |
| 11 | +if ! tty -s; then | |
| 12 | + echo `date '+%Y-%m-%d %H:%M:%S %z'`' Removing dangling volumes ...' | |
| 13 | +fi | |
| 14 | +$sudo docker volume ls -qf dangling=true | $sudo xargs --no-run-if-empty docker volume rm |
| @@ -1 +1 @@ | ||
| 1 | -0.5.8 | |
| 1 | +0.5.9 |
Fork