Commit 95d203cd authored by Fam Zheng's avatar Fam Zheng
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <1470202928-3392-1-git-send-email-famz@redhat.com>
parent 42e0d60f

tests/docker/Makefile.include

+2 −3
Original line number Diff line number Diff line
@@ -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) \