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

docker: remove unused debian-sid 



debian-sid 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-6-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 dad47814

tests/docker/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +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 := debian9 debian10 debian-sid

DOCKER_PARTIAL_IMAGES := debian9 debian10

DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap

DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))

DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))

tests/docker/dockerfiles/debian-sid.docker

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

# Debian Sid Base

#

# Currently we can build all our guests with cross-compilers in the

# latest Debian release (Buster). However new compilers will first

# arrive in Sid. However Sid is a rolling distro which may be broken

# at any particular time. To try and mitigate this we use Debian's

# snapshot archive which provides a "stable" view of what state Sid

# was in.

#



# This must be earlier than the snapshot date we are aiming for

FROM debian:sid-20190812-slim



 # Use a snapshot known to work (see http://snapshot.debian.org/#Usage)

ENV DEBIAN_SNAPSHOT_DATE "20190820"

RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [check-valid-until=no] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_DATE} \2%" /etc/apt/sources.list



# Duplicate deb line as deb-src

RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list



# Install common build utilities

RUN apt update && \

    DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \

    DEBIAN_FRONTEND=noninteractive eatmydata \

    apt install -y --no-install-recommends \

        bison \

        build-essential \

        ca-certificates \

        flex \

        git \

        pkg-config \

        psmisc \

        python \

        texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }