From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de, pbonzini@redhat.com,
stefanha@redhat.com, stefanb@linux.vnet.ibm.com,
marcandre.lureau@redhat.com
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
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 [thread overview]
Message-ID: <20180530110655.22022-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180530110655.22022-1-alex.bennee@linaro.org>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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>
---
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: docker-$t@$i) \
$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
--
2.17.0
next prev parent reply other threads:[~2018-05-30 11:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 11:06 [Qemu-devel] [PATCH v1 0/8] Travis stability and a few docker patches Alex Bennée
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 1/8] .travis.yml: disable linux-user build for gcov Alex Bennée
2018-05-31 16:13 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 2/8] docker: sort images list displayed by 'make docker' Alex Bennée
2018-05-30 11:06 ` Alex Bennée [this message]
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 4/8] docker: update Travis docker image Alex Bennée
2018-05-31 16:19 ` Philippe Mathieu-Daudé
2018-05-31 20:14 ` Alex Bennée
2018-05-31 23:08 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 5/8] .travis.yml: rationalise clang testing Alex Bennée
2018-05-31 16:10 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 6/8] .travis.yml: make current setup explicit Alex Bennée
2018-05-31 16:12 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 7/8] .travis.yml: update GCC sanitizer build to GCC 7 Alex Bennée
2018-05-31 16:11 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 8/8] tests/Makefile: mark flakey tests (!UPSTREAM) Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180530110655.22022-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).