[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 5/6] docker: remove unused debian-sid
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v3 5/6] docker: remove unused debian-sid |
Date: |
Tue, 24 Sep 2019 17:06:03 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 |
On 9/23/19 8:11 PM, John Snow wrote:
> 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: John Snow <address@hidden>
> ---
> tests/docker/Makefile.include | 2 +-
> tests/docker/dockerfiles/debian-sid.docker | 35 ----------------------
> 2 files changed, 1 insertion(+), 36 deletions(-)
> delete mode 100644 tests/docker/dockerfiles/debian-sid.docker
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 7bcd97101e..d7b1082b5b 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -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))
> diff --git a/tests/docker/dockerfiles/debian-sid.docker
> b/tests/docker/dockerfiles/debian-sid.docker
> deleted file mode 100644
> index 2a1bcc33b2..0000000000
> --- a/tests/docker/dockerfiles/debian-sid.docker
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -#
> -# 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; }
>
Acked-by: Philippe Mathieu-Daudé <address@hidden>
- [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, 2019/09/23
- [PATCH v3 5/6] docker: remove unused debian-sid, John Snow, 2019/09/23
- Re: [PATCH v3 5/6] docker: remove unused debian-sid,
Philippe Mathieu-Daudé <=
- [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