From eff358e27eec4b522c33f2617427a89b8484160b Mon Sep 17 00:00:00 2001 From: Ashish Amarnath Date: Thu, 16 Jul 2020 13:53:49 -0700 Subject: [PATCH] replace -q with -f for docker rmi in build-image make target (#2716) Signed-off-by: Ashish Amarnath --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 27f7a00d8..74f83447c 100644 --- a/Makefile +++ b/Makefile @@ -277,11 +277,11 @@ endif build-image: @# When we build a new image we just untag the old one. @# This makes sure we don't leave the orphaned image behind. - id=$$(docker image inspect --format '{{ .ID }}' ${BUILDER_IMAGE} 2>/dev/null); \ + @id=$$(docker image inspect --format '{{ .ID }}' ${BUILDER_IMAGE} 2>/dev/null); \ cd hack/build-image && docker build --pull -t $(BUILDER_IMAGE) . ; \ new_id=$$(docker image inspect --format '{{ .ID }}' ${BUILDER_IMAGE} 2>/dev/null); \ - if [ "$$id" != "$$new_id" ]; then \ - docker rmi -q $$id || true; \ + if [ "$$id" != "" ] && [ "$$id" != "$$new_id" ]; then \ + docker rmi -f $$id || true; \ fi push-build-image: