summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-20 17:31:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-20 17:31:30 +0000
commitce9fababd8eda750e4f8fda0d45a6c3a28c49e18 (patch)
tree1be85ecb968f75b53ac0f7b27c3fe5c938e5c256
parent826ee757c53f2975b0e704a69e45dfcf2f7fb2d8 (diff)
parenta52cd392c1aab02c7969ec8383ed1a4582698315 (diff)
Merge "Makefile: Fix and update docker-clean."
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1772637e..d106df2b 100644
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,15 @@ patches-import:
git am ${root}/patches/$$name/*.patch; \
fi'
clean-docker:
- docker stop FUEL_CENTOS_8.0 || true
- docker rm $(shell docker ps -a -q) || true
- docker rmi -f $(shell docker images -q) || true
+ @if [ -d ${root}/upstream/fuel/build ]; then \
+ sudo make -C ${root}/upstream/fuel/build deepclean; \
+ fi
+ @for container in $(shell sudo docker ps -a -q); do \
+ sudo docker rm -f -v $${container}; \
+ done
+ @for image in $(shell sudo docker images -q); do \
+ sudo docker rmi -f $${image}; \
+ done
clean-build:
sudo rm -rf /tmp/fuel-main