Commit dad47814 authored by John Snow's avatar John Snow Committed by Alex Bennée
Browse files

docker: remove unused debian-ports 



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: default avatarJohn Snow <jsnow@redhat.com>
Message-Id: <20190923181140.7235-5-jsnow@redhat.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Acked-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent ef8f3283

tests/docker/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/docker/dockerfiles/debian-ports.docker

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
#

# 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)