[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 4/6] docker: remove unused debian-ports
From: |
John Snow |
Subject: |
[PATCH v3 4/6] docker: remove unused debian-ports |
Date: |
Mon, 23 Sep 2019 14:11:38 -0400 |
debian-ports is listed as a partial image, so we cannot run tests against it.
Since it isn't used by any other testable image, remove it for now as it
is prone to bitrot.
Signed-off-by: John Snow <address@hidden>
---
tests/docker/Makefile.include | 2 +-
tests/docker/dockerfiles/debian-ports.docker | 36 --------------------
2 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644 tests/docker/dockerfiles/debian-ports.docker
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 983224ad96..7bcd97101e 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
# we don't run tests on intermediate images (used as base by another image)
DOCKER_PARTIAL_IMAGES := debian9 debian10 debian-sid
-DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap
+DOCKER_PARTIAL_IMAGES += debian9-mxe 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/debian-ports.docker
b/tests/docker/dockerfiles/debian-ports.docker
deleted file mode 100644
index 61bc3f2993..0000000000
--- a/tests/docker/dockerfiles/debian-ports.docker
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Docker multiarch cross-compiler target
-#
-# This docker target is builds on Debian Ports 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:unstable
-
-MAINTAINER Philippe Mathieu-Daudé <address@hidden>
-
-RUN echo "deb [arch=amd64] http://deb.debian.org/debian unstable main" >
/etc/apt/sources.list
-
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed -ne "s/^deb\ \(\[.*\]\ \)\?\(.*\)/deb-src
\2/p" >> /etc/apt/sources.list
-
-# Setup some basic tools we need
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt-get install -y --no-install-recommends \
- bison \
- build-essential \
- ca-certificates \
- clang \
- debian-ports-archive-keyring \
- flex \
- gettext \
- git \
- pkg-config \
- psmisc \
- python \
- texinfo \
- $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\
-f2)
--
2.21.0
- [PATCH v3 0/6] docker: misc cleanups, John Snow, 2019/09/23
- [PATCH v3 1/6] docker: remove debian8-mxe definitions, John Snow, 2019/09/23
- [PATCH v3 3/6] docker: remove 'deprecated' image definitions, John Snow, 2019/09/23
- [PATCH v3 2/6] docker: removed unused debian8 partial image, John Snow, 2019/09/23
- [PATCH v3 4/6] docker: remove unused debian-ports,
John Snow <=
- [PATCH v3 5/6] docker: remove unused debian-sid, John Snow, 2019/09/23
- [PATCH v3 6/6] docker: move tests from python2 to python3, John Snow, 2019/09/23
- Re: [PATCH v3 0/6] docker: misc cleanups, John Snow, 2019/09/23
- Re: [PATCH v3 0/6] docker: misc cleanups, Alex Bennée, 2019/09/24