From d449edfbdb77967511a08eeb1cb974725e80eb2a Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Tue, 2 Jan 2018 13:32:03 -0800 Subject: [PATCH] Ensure `make clean` always succeeds Sometimes this will fail if the docker daemon claims to have already removed some stuff. Messy messy messy --- proxy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/Makefile b/proxy/Makefile index 9076f3d..bb3c8d4 100644 --- a/proxy/Makefile +++ b/proxy/Makefile @@ -12,10 +12,10 @@ container: Dockerfile nginx.conf supervisord.conf docker build -t $(IMAGE_NAME):latest . clean: $(COMPOSE) - $(COMPOSE) down - docker rmi $(shell docker images -q -f "reference=$(IMAGE_NAME)") rm -rf bats rm -rf build + $(COMPOSE) down + docker rmi $(shell docker images -q -f "reference=$(IMAGE_NAME)") || true bats: