[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 3/8] docker: do not display deprecated images in
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 3/8] docker: do not display deprecated images in 'make docker' help |
Date: |
Wed, 30 May 2018 12:06:50 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
the 'debian' base image is deprecated since 3e11974988d8
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-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 50cd51a54e..31f21a43f5 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) \
--
2.17.0
- [Qemu-devel] [PATCH v1 0/8] Travis stability and a few docker patches, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 1/8] .travis.yml: disable linux-user build for gcov, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 4/8] docker: update Travis docker image, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 5/8] .travis.yml: rationalise clang testing, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 3/8] docker: do not display deprecated images in 'make docker' help,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 7/8] .travis.yml: update GCC sanitizer build to GCC 7, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 8/8] tests/Makefile: mark flakey tests (!UPSTREAM), Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 6/8] .travis.yml: make current setup explicit, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 2/8] docker: sort images list displayed by 'make docker', Alex Bennée, 2018/05/30