From: Fam Zheng <famz@redhat.com>
Date: Wed, 3 Aug 2016 05:42:08 +0000 (+0800)
Subject: docker: Be compatible with older docker
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=95d203cd1e3aaa8bbc1b3bd45de65f7b655fd46a;p=qemu.git

docker: Be compatible with older docker

By not using "--format" with docker images command.

The option is not available on RHEL 7 docker command. Use an awk
matching command instead.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1470202928-3392-1-git-send-email-famz@redhat.com>
---

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 78af46837b..4f4707dae0 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -107,9 +107,8 @@ docker-run-%: docker-qemu-src
 	fi
 	$(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \
 		$(call quiet-command,\
-			if $(SRC_PATH)/tests/docker/docker.py images \
-				--format={{.Repository}}:{{.Tag}} | \
-					grep -qx qemu:$(IMAGE); then \
+			if $(SRC_PATH)/tests/docker/docker.py images | \
+				awk '$$1=="qemu" && $$2=="$(IMAGE)"{found=1} END{exit(!found)}'; then \
 				$(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \
 				-t \
 				$(if $(DEBUG),-i,--net=none) \