* [Qemu-devel] [PATCH] docker: Be compatible with older docker
@ 2016-08-03 5:42 Fam Zheng
2016-08-04 2:33 ` Fam Zheng
0 siblings, 1 reply; 3+ messages in thread
From: Fam Zheng @ 2016-08-03 5:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini
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>
---
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 78af468..4f4707d 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) \
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] docker: Be compatible with older docker
2016-08-03 5:42 [Qemu-devel] [PATCH] docker: Be compatible with older docker Fam Zheng
@ 2016-08-04 2:33 ` Fam Zheng
2016-08-04 12:39 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Fam Zheng @ 2016-08-04 2:33 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On Wed, 08/03 13:42, Fam Zheng wrote:
> 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>
> ---
> 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 78af468..4f4707d 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) \
> --
> 2.7.4
>
>
Paolo, does this work for you?
Fam
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] docker: Be compatible with older docker
2016-08-04 2:33 ` Fam Zheng
@ 2016-08-04 12:39 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2016-08-04 12:39 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel
On 04/08/2016 04:33, Fam Zheng wrote:
> On Wed, 08/03 13:42, Fam Zheng wrote:
>> 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>
>> ---
>> tests/docker/Makefile.include | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> Paolo, does this work for you?
Yes, it works. Thanks!
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-04 12:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-03 5:42 [Qemu-devel] [PATCH] docker: Be compatible with older docker Fam Zheng
2016-08-04 2:33 ` Fam Zheng
2016-08-04 12:39 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).