From 84bca287b5a13ee6bf7ffdfb803b4dff4cb06657 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Fri, 30 Dec 2016 16:12:30 -0700 Subject: [PATCH] UPSTREAM: util/docker: Update makefile with command to kill docker images Kill running docker containers before trying to remove images or containers. BUG=none BRANCH=none TEST=none Change-Id: I6768e6f931e62ca9e079f4a13728581484d3b4f0 Signed-off-by: Patrick Georgi Original-Commit-Id: af25fd78e8edcf0d46acdd5f45d1379770753b30 Original-Change-Id: Id2de90edbe5d0dc6ecb906be7101ad9744dbd11e Original-Signed-off-by: Martin Roth Original-Reviewed-on: https://review.coreboot.org/17999 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Patrick Georgi Reviewed-on: https://chromium-review.googlesource.com/433979 --- util/docker/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/util/docker/Makefile b/util/docker/Makefile index 45e23b0091..113e1ca866 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -39,10 +39,15 @@ coreboot-jenkins-node: test_docker upload-coreboot-jenkins-node: test_docker_login $(DOCKER) push coreboot/coreboot-jenkins-node:$(crossgcc_version) -clean_coreboot_containers: test_docker +docker-killall: test_docker + @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \ + $(DOCKER) kill $$($(DOCKER) ps | grep 'coreboot' | cut -f1 -d ' '); \ + fi + +clean_coreboot_containers: docker-killall $(DOCKER) rm $(docker ps -a | grep 'coreboot' | sed 's|\s.*$||') -clean_coreboot_images: test_docker +clean_coreboot_images: docker-killall $(DOCKER) rmi $(docker images | grep coreboot | sed 's|^\S\+\s\+\S\+\s\+||' | sed 's|\s.*$||') docker_build_coreboot: test_docker