[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/5] docker: removed unused debian8 partial image
From: |
John Snow |
Subject: |
[PATCH v2 5/5] docker: removed unused debian8 partial image |
Date: |
Fri, 20 Sep 2019 18:12:55 -0400 |
debian8 partial base is also not consumed by any image, so remove it.
Signed-off-by: John Snow <address@hidden>
---
tests/docker/Makefile.include | 3 +--
tests/docker/dockerfiles/debian8.docker | 33 -------------------------
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 cb41652885..b9430822b8 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -5,8 +5,7 @@
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10
-DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
+DOCKER_PARTIAL_IMAGES := debian9 debian9-mxe debian10 debian-bootstrap
DOCKER_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
diff --git a/tests/docker/dockerfiles/debian8.docker
b/tests/docker/dockerfiles/debian8.docker
deleted file mode 100644
index be67023826..0000000000
--- a/tests/docker/dockerfiles/debian8.docker
+++ /dev/null
@@ -1,33 +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é <address@hidden>
-
-# 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 \
- python3-minimal
--
2.21.0