diff options
| author | John Snow <jsnow@redhat.com> | 2019-09-23 14:11:36 -0400 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-09-26 19:00:53 +0100 |
| commit | afa1cf4329670379c9895640c11d00a8a88c93e2 (patch) | |
| tree | 0702c6705867e62bdd11ab5542e285b0c5a083e2 | |
| parent | ccf20b3b4f13dbb513f030469d4f5c282c700082 (diff) | |
| download | focaccia-qemu-afa1cf4329670379c9895640c11d00a8a88c93e2.tar.gz focaccia-qemu-afa1cf4329670379c9895640c11d00a8a88c93e2.zip | |
docker: remove unused debian8 partial image
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 <jsnow@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190923181140.7235-3-jsnow@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
| -rw-r--r-- | tests/docker/Makefile.include | 2 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian8.docker | 34 |
2 files changed, 1 insertions, 35 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 274c848a1c..47ff777440 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 1212a85c35..0000000000 --- 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é <f4bug@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 - |