From 417378b756b4b83cc79ce6e264dc8bcadc5d00a3 Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Sun, 13 Sep 2020 20:14:46 +0800 Subject: [PATCH] =?UTF-8?q?[fix:3.12]=E6=9B=B4=E6=96=B0Makefile=E7=9B=B8?= =?UTF-8?q?=E5=85=B3clean=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9cb1225..ac73499 100644 --- a/Makefile +++ b/Makefile @@ -27,15 +27,15 @@ build: @docker tag $(app_name):$(current_tag) $(app_name):latest # 清理悬空的镜像（无TAG）及停止的容器 -clean: +clearclean: clean @echo "Clean untaged images and stoped containers..." - @docker ps -a | grep "Exited" | awk '{print $$1}' | xargs -L 1 docker rm | : - @docker images | grep '' | awk '{print $$3}' | xargs -L 1 docker rmi -f | : + @docker ps -a | grep "Exited" | awk '{print $$1}' | sort -u | xargs -L 1 docker rm + @docker images | grep '' | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f # 为了防止删除前缀名相同的镜像，在过滤条件中加入一个空格进行过滤 -clearclean: clean +clean: @echo "Clean all images for current application..." - @docker images | grep "$(app_name) " | awk '{print $$3}' | xargs -L 1 docker rmi -f | : + @docker images | grep "$(app_name) " | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f # 更新所有 colovu 仓库的镜像 upgrade: