From 95d203cd1e3aaa8bbc1b3bd45de65f7b655fd46a Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 3 Aug 2016 13:42:08 +0800 Subject: [PATCH] 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 Signed-off-by: Fam Zheng Message-Id: <1470202928-3392-1-git-send-email-famz@redhat.com> --- tests/docker/Makefile.include | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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) \