| Message ID | 20190923181140.7235-5-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | docker: misc cleanups | expand |
On 9/23/19 8:11 PM, John Snow wrote: > 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 <jsnow@redhat.com> > --- > 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é <f4bug@amsat.org> > - > -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) > Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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é <f4bug@amsat.org> - -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)
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 <jsnow@redhat.com> --- 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