docker-prune: added network prune; docker-deploy: only create directories with absolute path name

This commit is contained in:
Marc Wäckerlin
2019-09-20 16:46:58 +02:00
parent 5e426c5740
commit f4314812db
2 changed files with 3 additions and 1 deletions

View File

@@ -49,7 +49,7 @@ for f in $*; do
exit 1 exit 1
fi fi
echo "... deploying ${f##*/}" echo "... deploying ${f##*/}"
for d in $(sed -n 's/^ *source: *//p' ${f}.yaml); do for d in $(sed -n 's,^ *source: \(/.*\),\1,p' ${f}.yaml); do
test -e $d || mkdir -p $d test -e $d || mkdir -p $d
done done
docker stack deploy --compose-file ${f}.yaml ${f##*/} docker stack deploy --compose-file ${f}.yaml ${f##*/}

View File

@@ -137,9 +137,11 @@ trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FU
if test -z "$filter"; then if test -z "$filter"; then
run docker container prune -f run docker container prune -f
run docker volume prune -f run docker volume prune -f
run docker network prune -f
run docker image prune -a -f run docker image prune -a -f
else else
run docker container prune -f --filter "$filter" run docker container prune -f --filter "$filter"
run docker volume prune -f run docker volume prune -f
run docker network prune -f
run docker image prune -a -f --filter "$filter" run docker image prune -a -f --filter "$filter"
fi fi