build/Makefile: deepclean: make grep more strict 93/27193/1 stable/colorado
authorAnders Roxell <anders.roxell@enea.com>
Tue, 13 Dec 2016 17:35:18 +0000 (18:35 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 18 Jan 2017 20:43:20 +0000 (20:43 +0000)
Check if the docker image is named only 'ubuntu' and tag 14.04

JIRA: FUEL-245

Change-Id: I4dc58a295925cc64a1d5c52393e1c172d42f8a6e
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
(cherry picked from commit ba2b4510c4c90e75927d90c976ba2afec97f0228)

build/Makefile

index b760568..1d1b740 100644 (file)
@@ -188,7 +188,7 @@ deepclean: clean clean-cache
        docker rmi opnfv.org/ubuntu-builder:14.04 &>/dev/null || exit 0
        docker rmi opnfv.org/ubuntu-builder:latest &>/dev/null || exit 0
        docker rmi ubuntu:14.04 &>/dev/null || exit 0
-       @if docker images | grep -q "ubuntu *14.04"; then \
+       @if docker images | grep -q "^ubuntu *14.04"; then \
                echo "Error: ubuntu:14.04 still present!"; \
                exit 1; \
        fi