Correct docker cleaning 71/13571/1
authorStanislaw Kardach <kda@semihalf.com>
Wed, 20 Apr 2016 23:34:58 +0000 (16:34 -0700)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 2 May 2016 14:34:59 +0000 (14:34 +0000)
So there was a very stupid mistake in the docker container cleaning
that this patch fixes.

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
(cherry picked from commit 6bf15cd4182cdab5606f4198f3eb30f452345648)

Change-Id: I3e37100af715ff1e1aa4a8303df8af3004eb8723

Makefile

index e58fe0d..0b285a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@ patches-import:
                fi'
 clean-docker:
        docker stop FUEL_CENTOS_8.0 || true
-       docker rm $(docker ps -a -q) || true
-       docker rmi -f $(docker images -q) || true
+       docker rm $(shell docker ps -a -q) || true
+       docker rmi -f $(shell docker images -q) || true
 
 clean-build:
        sudo rm -rf /tmp/fuel-main