[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions |
Date: |
Thu, 26 Sep 2019 00:23:56 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 |
On 9/24/19 11:01 PM, Alex Bennée wrote:
> From: John Snow <address@hidden>
>
> There isn't a debian.dockerfile anymore,
> so perform some ghost-busting.
Won't we deprecate other images in the future?
> Signed-off-by: John Snow <address@hidden>
> Message-Id: <address@hidden>
> Signed-off-by: Alex Bennée <address@hidden>
> ---
> tests/docker/Makefile.include | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 82d5a8a5393..fd6f470fbf8 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -4,11 +4,10 @@
>
> DOCKER_SUFFIX := .docker
> DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> -DOCKER_DEPRECATED_IMAGES := debian
> # we don't run tests on intermediate images (used as base by another image)
> -DOCKER_PARTIAL_IMAGES := debian debian9 debian10 debian-sid
> +DOCKER_PARTIAL_IMAGES := debian9 debian10 debian-sid
> DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap
> -DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir
> $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
> +DOCKER_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
> @@ -160,7 +159,7 @@ docker-image-debian-powerpc-user-cross:
> docker-binfmt-image-debian-powerpc-user
> DOCKER_USER_IMAGES += debian-powerpc-user
>
> # Expand all the pre-requistes for each docker image and test combination
> -$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)
> $(DOCKER_DEPRECATED_IMAGES)), \
> +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
> $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
> $(eval .PHONY: docker-$t@$i) \
> $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
>
- Re: [PATCH v3 28/33] docker: removed unused debian8 partial image, (continued)
- [PATCH v3 23/33] docs/devel: add "check-tcg" to testing.rst, Alex Bennée, 2019/09/24
- [PATCH v3 26/33] .shippable.yml: Build WHPX enabled binaries, Alex Bennée, 2019/09/24
- [PATCH v3 22/33] configure: preserve PKG_CONFIG for subdir builds, Alex Bennée, 2019/09/24
- [PATCH v3 32/33] docker: move tests from python2 to python3, Alex Bennée, 2019/09/24
- [PATCH v3 29/33] docker: remove 'deprecated' image definitions, Alex Bennée, 2019/09/24
- Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions,
Philippe Mathieu-Daudé <=
- Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions, Alex Bennée, 2019/09/25
- Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions, Philippe Mathieu-Daudé, 2019/09/26
- Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions, Alex Bennée, 2019/09/26
- Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions, Philippe Mathieu-Daudé, 2019/09/26
- Re: [PATCH v3 29/33] docker: remove 'deprecated' image definitions, John Snow, 2019/09/26
[PATCH v3 25/33] tests/docker: Add fedora-win10sdk-cross image, Alex Bennée, 2019/09/24
[PATCH v3 16/33] podman: fix command invocation, Alex Bennée, 2019/09/24