From c24952fe6826de2e74994d1b7bf4738f22693fe1 Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Sun, 13 Sep 2020 20:13:49 +0800
Subject: [PATCH] =?UTF-8?q?[fix:6.0]=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 05adb24..8649d61 100644
--- a/Makefile
+++ b/Makefile
@@ -36,15 +36,15 @@ build: build-debian build-alpine
 	@echo "Build complete"
 
 # 清理悬空的镜像（无TAG）及停止的容器 
-clean:
+clearclean: clean
 	@echo "Clean untaged images and stoped containers..."
-	@docker ps -a | grep "Exited" | awk '{print $$1}' | xargs docker rm | :
-	@docker images | grep '<none>' | awk '{print $$3}' | xargs docker rmi -f | :
+	@docker ps -a | grep "Exited" | awk '{print $$1}' | sort -u | xargs -L 1 docker rm
+	@docker images | grep '<none>' | 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 docker rmi -f | :
+	@docker images | grep "$(app_name) " | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f
 
 tag:
 	@echo "Add tag: $(local_registory)/$(app_name):latest"