diff --git a/Makefile b/Makefile index 89fd28d..ef2086d 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 tag: @echo "Add tag: $(local_registory)/$(app_name):latest"