From 003fccc8e38b313110db353e265a380c4a3266f4 Mon Sep 17 00:00:00 2001 From: sharils Date: Thu, 7 Dec 2017 21:15:19 +0800 Subject: [PATCH 1/4] Make dkrmui work in Mac and BSD --- aliases/available/docker.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/available/docker.aliases.bash b/aliases/available/docker.aliases.bash index 7d837c70..c863e312 100644 --- a/aliases/available/docker.aliases.bash +++ b/aliases/available/docker.aliases.bash @@ -9,7 +9,7 @@ alias dkpsa='docker ps -a' # List all Docker containers alias dki='docker images' # List Docker images alias dkrmac='docker rm $(docker ps -a -q)' # Delete all Docker containers alias dkrmlc='docker-remove-most-recent-container' # Delete most recent (i.e., last) Docker container -alias dkrmui='docker images -q -f dangling=true |xargs -r docker rmi' # Delete all untagged Docker images +alias dkrmui='docker images -q -f dangling=true |xargs docker rmi' # Delete all untagged Docker images alias dkrmall='docker-remove-stale-assets' # Delete all untagged images and exited containers alias dkrmli='docker-remove-most-recent-image' # Delete most recent (i.e., last) Docker image alias dkrmi='docker-remove-images' # Delete images for supplied IDs or all if no IDs are passed as arguments From 3863a6b2ea6ff66c43a7b9baf8d871c66a33fc1d Mon Sep 17 00:00:00 2001 From: sharils Date: Fri, 8 Dec 2017 21:10:11 +0800 Subject: [PATCH 2/4] Make backward compatible --- aliases/available/docker.aliases.bash | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/aliases/available/docker.aliases.bash b/aliases/available/docker.aliases.bash index c863e312..53488671 100644 --- a/aliases/available/docker.aliases.bash +++ b/aliases/available/docker.aliases.bash @@ -9,7 +9,14 @@ alias dkpsa='docker ps -a' # List all Docker containers alias dki='docker images' # List Docker images alias dkrmac='docker rm $(docker ps -a -q)' # Delete all Docker containers alias dkrmlc='docker-remove-most-recent-container' # Delete most recent (i.e., last) Docker container -alias dkrmui='docker images -q -f dangling=true |xargs docker rmi' # Delete all untagged Docker images +case $OSTYPE in + darwin*) + alias dkrmui='docker images -q -f dangling=true |xargs docker rmi' # Delete all untagged Docker images + ;; + *) + alias dkrmui='docker images -q -f dangling=true |xargs -r docker rmi' # Delete all untagged Docker images + ;; +esac alias dkrmall='docker-remove-stale-assets' # Delete all untagged images and exited containers alias dkrmli='docker-remove-most-recent-image' # Delete most recent (i.e., last) Docker image alias dkrmi='docker-remove-images' # Delete images for supplied IDs or all if no IDs are passed as arguments From 803a57749dfb7a7406bf8c7307f1f3cf2706fbbf Mon Sep 17 00:00:00 2001 From: sharils Date: Mon, 11 Dec 2017 22:11:46 +0800 Subject: [PATCH 3/4] Add bsd support --- aliases/available/docker.aliases.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aliases/available/docker.aliases.bash b/aliases/available/docker.aliases.bash index 53488671..96ac68be 100644 --- a/aliases/available/docker.aliases.bash +++ b/aliases/available/docker.aliases.bash @@ -10,6 +10,9 @@ alias dki='docker images' # List Docker images alias dkrmac='docker rm $(docker ps -a -q)' # Delete all Docker containers alias dkrmlc='docker-remove-most-recent-container' # Delete most recent (i.e., last) Docker container case $OSTYPE in + bsd*) + alias dkrmui='docker images -q -f dangling=true |xargs docker rmi' # Delete all untagged Docker images + ;; darwin*) alias dkrmui='docker images -q -f dangling=true |xargs docker rmi' # Delete all untagged Docker images ;; From ca8ae9c767c4a9c430155c91c9a55a99edac7669 Mon Sep 17 00:00:00 2001 From: Nils Winkler Date: Tue, 12 Dec 2017 07:12:00 +0100 Subject: [PATCH 4/4] Fixed case statement I've combined the `darwin` (macOS) and BSD cases into one case. --- aliases/available/docker.aliases.bash | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/aliases/available/docker.aliases.bash b/aliases/available/docker.aliases.bash index 96ac68be..e3601d6f 100644 --- a/aliases/available/docker.aliases.bash +++ b/aliases/available/docker.aliases.bash @@ -9,17 +9,16 @@ alias dkpsa='docker ps -a' # List all Docker containers alias dki='docker images' # List Docker images alias dkrmac='docker rm $(docker ps -a -q)' # Delete all Docker containers alias dkrmlc='docker-remove-most-recent-container' # Delete most recent (i.e., last) Docker container + case $OSTYPE in - bsd*) - alias dkrmui='docker images -q -f dangling=true |xargs docker rmi' # Delete all untagged Docker images - ;; - darwin*) - alias dkrmui='docker images -q -f dangling=true |xargs docker rmi' # Delete all untagged Docker images + darwin*|*bsd*|*BSD*) + alias dkrmui='docker images -q -f dangling=true | xargs docker rmi' # Delete all untagged Docker images ;; *) - alias dkrmui='docker images -q -f dangling=true |xargs -r docker rmi' # Delete all untagged Docker images + alias dkrmui='docker images -q -f dangling=true | xargs -r docker rmi' # Delete all untagged Docker images ;; esac + alias dkrmall='docker-remove-stale-assets' # Delete all untagged images and exited containers alias dkrmli='docker-remove-most-recent-image' # Delete most recent (i.e., last) Docker image alias dkrmi='docker-remove-images' # Delete images for supplied IDs or all if no IDs are passed as arguments