Skip to content

Commit 6ac24f3

Browse files
committed
[BUILD] Ignore 'docker-clean' Output on Failure
When docker images don't exist, or have already been removed, the 'docker-clean' target lists failures for 'docker rmi' because it requires at least on argument. This ensures at least one argument is passed ('' if no images). Change-Id: Ie2a47ca028dbafd65fd643c0272bf64fc7bdd030 Signed-off-by: Trevor Bramwell <[email protected]>
1 parent 44b3c13 commit 6ac24f3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ protos: gotools
215215

216216
%-docker-clean:
217217
$(eval TARGET = ${patsubst %-docker-clean,%,${@}})
218-
-docker images -q $(PROJECT_NAME)-$(TARGET) | xargs docker rmi -f
218+
-docker images -q $(PROJECT_NAME)-$(TARGET) | xargs -I '{}' docker rmi -f '{}'
219219
-@rm -rf build/image/$(TARGET) ||:
220220

221221
docker-clean: $(patsubst %,%-docker-clean, $(IMAGES))

0 commit comments

Comments
 (0)