| Message ID | 20190904203013.9028-22-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | current testing/next queue (podman, docker, ci) | expand |
On 9/4/19 10:29 PM, Alex Bennée wrote: > Debian Sid was only ever a stop gap and thanks to the much better > cross compiler in the Buster release we don't need it any more. Send > it on its merry way. I'm not sure about this one... Why not update and keep it? -- >8 -- -FROM debian:sid-20181011-slim +FROM debian:sid-20190812-slim # Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20181030" +ENV DEBIAN_SNAPSHOT_DATE "20190820" --- > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/Makefile.include | 2 +- > tests/docker/dockerfiles/debian-sid.docker | 41 ---------------------- > 2 files changed, 1 insertion(+), 42 deletions(-) > delete mode 100644 tests/docker/dockerfiles/debian-sid.docker > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index b6c04059502..59fbebbe2e6 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 > DOCKER_DEPRECATED_IMAGES := debian > # we don't run tests on intermediate images (used as base by another image) > -DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-sid debian-bootstrap > +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-bootstrap > DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_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-sid.docker b/tests/docker/dockerfiles/debian-sid.docker > deleted file mode 100644 > index 513459ca7f8..00000000000 > --- a/tests/docker/dockerfiles/debian-sid.docker > +++ /dev/null > @@ -1,41 +0,0 @@ > -# > -# Debian Sid Base > -# > -# A number of our guests exist as ports only. We can either use the > -# ports repo or get everything from Sid. However Sid is a rolling > -# distro which may be broken at any particular time. If you are > -# unlucky and try and build your images while gcc is in the process of > -# being uploaded this can fail. Your only recourse is to try again in > -# a few hours when the repos have re-synced. Once built however you > -# won't be affected by repo changes unless the docker recipies are > -# updated and trigger a re-build. > -# > - > -# This must be earlier than the snapshot date we are aiming for > -FROM debian:sid-20181011-slim > - > -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) > -ENV DEBIAN_SNAPSHOT_DATE "20181030" > -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 > - > -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) > -ENV DEBIAN_SNAPSHOT_DATE "20181030" > -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; } >
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b6c04059502..59fbebbe2e6 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 DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-sid debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_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-sid.docker b/tests/docker/dockerfiles/debian-sid.docker deleted file mode 100644 index 513459ca7f8..00000000000 --- a/tests/docker/dockerfiles/debian-sid.docker +++ /dev/null @@ -1,41 +0,0 @@ -# -# Debian Sid Base -# -# A number of our guests exist as ports only. We can either use the -# ports repo or get everything from Sid. However Sid is a rolling -# distro which may be broken at any particular time. If you are -# unlucky and try and build your images while gcc is in the process of -# being uploaded this can fail. Your only recourse is to try again in -# a few hours when the repos have re-synced. Once built however you -# won't be affected by repo changes unless the docker recipies are -# updated and trigger a re-build. -# - -# This must be earlier than the snapshot date we are aiming for -FROM debian:sid-20181011-slim - -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20181030" -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 - -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20181030" -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; }
Debian Sid was only ever a stop gap and thanks to the much better cross compiler in the Buster release we don't need it any more. Send it on its merry way. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-sid.docker | 41 ---------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-sid.docker -- 2.20.1