[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: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help |
Date: |
Wed, 17 Jan 2018 11:01:01 +0000 |
User-agent: |
mu4e 1.0-alpha3; emacs 26.0.91 |
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>
> ---
> 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
- [Qemu-devel] [PATCH v2 0/8] docker: update Ubuntu and Fedora images, deprecate old ones, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v2 1/8] docker: sort images list displayed by 'make docker', Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help, Philippe Mathieu-Daudé, 2018/01/15
- Re: [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 3/8] docker: add the Ubuntu Trusty base image, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v2 5/8] docker: warn users to use ubuntu16.04 for the LTS Xenial image, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v2 6/8] docker: add the Fedora 27 base image, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v2 8/8] docker: fix typo, Philippe Mathieu-Daudé, 2018/01/15