[coreboot-gerrit] Patch set updated for coreboot: util/docker: Update makefile with command to kill docker images
Martin Roth (martinroth@google.com)
gerrit at coreboot.org
Tue Jan 3 02:38:05 CET 2017
Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17999
-gerrit
commit 2d8a6a41d2829cffc8f82a06967a8b7b7df160b8
Author: Martin Roth <gaumless at gmail.com>
Date: Fri Dec 30 16:12:30 2016 -0700
util/docker: Update makefile with command to kill docker images
Kill running docker containers before trying to remove images or
containers.
Change-Id: Id2de90edbe5d0dc6ecb906be7101ad9744dbd11e
Signed-off-by: Martin Roth <gaumless at gmail.com>
---
util/docker/Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/util/docker/Makefile b/util/docker/Makefile
index 45e23b0..113e1ca 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
More information about the coreboot-gerrit
mailing list