erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: util/docker: Update makefile with command to kill docker images

Browse source 
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 <pgeorgi@chromium.org>
Original-Commit-Id: af25fd78e8
Original-Change-Id: Id2de90edbe5d0dc6ecb906be7101ad9744dbd11e
Original-Signed-off-by: Martin Roth <gaumless@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/17999
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/433979
This commit is contained in:
Martin Roth 2016-12-30 16:12:30 -07:00 • committed by chrome-bot
commit 84bca287b5
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
util/docker/Makefile
View file

@ -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