diff options
| author | Fam Zheng | 2016-08-03 07:42:08 +0200 |
|---|---|---|
| committer | Fam Zheng | 2016-08-05 10:34:52 +0200 |
| commit | 95d203cd1e3aaa8bbc1b3bd45de65f7b655fd46a (patch) | |
| tree | d12ca5b04b8ec5ec25b5b6f4d578e21ab2e6b07f /tests/docker | |
| parent | Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160804' int... (diff) | |
| download | qemu-95d203cd1e3aaa8bbc1b3bd45de65f7b655fd46a.tar.gz qemu-95d203cd1e3aaa8bbc1b3bd45de65f7b655fd46a.tar.xz qemu-95d203cd1e3aaa8bbc1b3bd45de65f7b655fd46a.zip | |
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>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/Makefile.include | 5 |
1 files 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) \ |