openstack
/
fuel-main
Code Issues Proposed changes

Skip docker clean if docker is not running 

Change-Id: I40adfe5f7b5ddea7e0d7917f34deb8a8081fe030
Closes-Bug: #1318633
This commit is contained in:
Matthew Mosesohn 2014-05-12 19:45:29 +04:00
parent fc249cd1fe
commit e09af324da
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirror/docker/module.mk
View File

@ -5,7 +5,8 @@ include $(SOURCE_DIR)/mirror/docker/base-images.mk
clean: clean-docker
clean-docker:
(docker rm -f `docker ps -aq`; docker rmi `docker images -q`) || exit 0
timeout -k5 4 sudo docker ps && sudo docker rm -f `sudo docker ps -a | awk '/fuel/ {print $$1}'` || true
timeout -k5 4 sudo docker images && sudo docker rmi -f `sudo docker images | awk '/fuel/ { print $$3; }'` || true
$(BUILD_DIR)/mirror/docker/build.done: \
$(BUILD_DIR)/mirror/docker/base-images.done