diff --git a/docker-deploy b/docker-deploy index c4df794..2debd69 100755 --- a/docker-deploy +++ b/docker-deploy @@ -49,7 +49,7 @@ for f in $*; do exit 1 fi 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 done docker stack deploy --compose-file ${f}.yaml ${f##*/} diff --git a/docker-prune b/docker-prune index a6c3278..fc724c7 100755 --- a/docker-prune +++ b/docker-prune @@ -137,9 +137,11 @@ trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FU if test -z "$filter"; then run docker container prune -f run docker volume prune -f + run docker network prune -f run docker image prune -a -f else run docker container prune -f --filter "$filter" run docker volume prune -f + run docker network prune -f run docker image prune -a -f --filter "$filter" fi