[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help |
Date: |
Sat, 26 May 2018 02:19:40 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
Hi Alex,
On 01/17/2018 08:01 AM, Alex Bennée wrote:
>
> Philippe Mathieu-Daudé <address@hidden> writes:
>
>> the 'debian' base image is deprecated since 3e11974988d8
>>
>> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>
> Reviewed-by: Alex Bennée <address@hidden>
Can you also queue this patch?
>
>> ---
>> tests/docker/Makefile.include | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>> index ef95703cef..d5cf896966 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -4,7 +4,8 @@
>>
>> DOCKER_SUFFIX := .docker
>> DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
>> -DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard
>> $(DOCKER_FILES_DIR)/*.docker))))
>> +DOCKER_DEPRECATED_IMAGES := debian
>> +DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir
>> $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
>> DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>> # Use a global constant ccache directory to speed up repetitive builds
>> DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
>> @@ -63,7 +64,7 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe
>> docker-image-travis: NOUSER=1
>>
>> # Expand all the pre-requistes for each docker image and test combination
>> -$(foreach i,$(DOCKER_IMAGES), \
>> +$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \
>> $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
>> $(eval .PHONY: address@hidden) \
>> $(eval address@hidden: docker-image-$i address@hidden) \
>
>
> --
> Alex Bennée
>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help,
Philippe Mathieu-Daudé <=