From 3bf09da5d440ac6e48573cf75d7612c2726cbc5b Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 24 May 2016 12:17:05 +0200 Subject: [PATCH] use "docker volume" subcommand when using docker 1.9+ `docker-cleanup-volumes.sh` doesn't remove volumes properly, since docker introduced the "volume" subcommand in 1.9.0. This patch detects the docker version, and runs either `docker-cleanup-volumes.sh` or `docker volume rm` accordingly. Fixes #24 --- run.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index e20d709..95151de 100755 --- a/run.sh +++ b/run.sh @@ -76,8 +76,17 @@ do if [ $DEBUG ]; then echo DEBUG: Starting loop; fi # Cleanup unused volumes - echo "=> Removing unused volumes" - /docker-cleanup-volumes.sh + + if [[ $(docker version --format '{{(index .Server.Version)}}' | grep -E '^[01]\.[012345678]\.') ]]; then + echo "=> Removing unused volumes using 'docker-cleanup-volumes.sh' script" + /docker-cleanup-volumes.sh + else + echo "=> Removing unused volumes using native 'docker volume' command" + for volume in $(docker volume ls -qf dangling=true); do + echo "Deleting ${volume}" + docker volume rm "${volume}" + done + fi IFS=' '