diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2018-01-15 11:34:53 -0300 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2018-06-01 14:55:03 +0100 |
| commit | bcaf457786c205d90ca99993048a289017685e05 (patch) | |
| tree | 4aa7bc2a67a2b3f22a49c3638002e97562c03f9e /tests/docker | |
| parent | 1a06f5c910785f1110a74e6575c5f71248b7fab0 (diff) | |
| download | qemu-bcaf457786c205d90ca99993048a289017685e05.zip qemu-bcaf457786c205d90ca99993048a289017685e05.tar.gz qemu-bcaf457786c205d90ca99993048a289017685e05.tar.bz2 | |
docker: do not display deprecated images in 'make docker' help
the 'debian' base image is deprecated since 3e11974988d8
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/Makefile.include | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 50cd51a..31f21a4 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) \ |