From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34626)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bV8TC-0000xS-TQ
	for qemu-devel@nongnu.org; Wed, 03 Aug 2016 22:33:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bV8T8-0002uB-Nm
	for qemu-devel@nongnu.org; Wed, 03 Aug 2016 22:33:13 -0400
Received: from mx1.redhat.com ([209.132.183.28]:54742)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bV8T8-0002u5-I8
	for qemu-devel@nongnu.org; Wed, 03 Aug 2016 22:33:10 -0400
Received: from int-mx11.intmail.prod.int.phx2.redhat.com
	(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 3AEEFC04D289
	for <qemu-devel@nongnu.org>; Thu,  4 Aug 2016 02:33:09 +0000 (UTC)
Date: Thu, 4 Aug 2016 10:33:07 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20160804023307.GA17054@ad.usersys.redhat.com>
References: <1470202928-3392-1-git-send-email-famz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1470202928-3392-1-git-send-email-famz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] docker: Be compatible with older docker
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org

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