summaryrefslogtreecommitdiff
path: root/util/docker
diff options
context:
space:
mode:
Diffstat (limited to 'util/docker')
-rw-r--r--util/docker/Makefile9
1 files 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