"removed" -> "remove" in subject?
On 9/24/19 11:01 PM, Alex Bennée wrote:
> From: John Snow <js...@redhat.com>
>
> debian8 partial base is also not consumed by any image, so remove it.
> For QEMU's development cycle, we only support debian9 (stretch) and
> debian10 (buster).
>
> Signed-off-by: John Snow <js...@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> Message-Id: <20190923181140.7235-3-js...@redhat.com>
> Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> tests/docker/Makefile.include | 2 +-
> tests/docker/dockerfiles/debian8.docker | 34 -------------------------
> 2 files changed, 1 insertion(+), 35 deletions(-)
> delete mode 100644 tests/docker/dockerfiles/debian8.docker
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 47d2273f29d..82d5a8a5393 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -6,7 +6,7 @@ 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 debian8 debian9 debian10 debian-sid
> +DOCKER_PARTIAL_IMAGES := debian 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_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
> diff --git a/tests/docker/dockerfiles/debian8.docker
> b/tests/docker/dockerfiles/debian8.docker
> deleted file mode 100644
> index 1212a85c35b..00000000000
> --- a/tests/docker/dockerfiles/debian8.docker
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -#
> -# Docker multiarch cross-compiler target
> -#
> -# This docker target is builds on Debian and Emdebian's cross compiler
> targets
> -# to build distro with a selection of cross compilers for building test
> binaries.
> -#
> -# On its own you can't build much but the docker-foo-cross targets
> -# build on top of the base debian image.
> -#
> -FROM debian:jessie-slim
> -
> -MAINTAINER Philippe Mathieu-Daudé <f4...@amsat.org>
> -
> -# Duplicate deb line as deb-src
> -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
> /etc/apt/sources.list
> -
> -# Setup some basic tools we need
> -RUN apt update && \
> - DEBIAN_FRONTEND=noninteractive apt-get install -yy eatmydata && \
> - DEBIAN_FRONTEND=noninteractive eatmydata \
> - apt-get install -y --no-install-recommends \
> - bison \
> - binutils-multiarch \
> - build-essential \
> - ca-certificates \
> - clang \
> - curl \
> - flex \
> - gettext \
> - git \
> - gnupg \
> - pkg-config \
> - python-minimal
> -
>
