Hi Alex, On 01/17/2018 08:01 AM, Alex Bennée wrote: > > Philippe Mathieu-Daudé <f4...@amsat.org> writes: > >> the 'debian' base image is deprecated since 3e11974988d8 >> >> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > > Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
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: docker-$t@$i) \ >> $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ > > > -- > Alex Bennée >
