[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image |
Date: |
Tue, 10 Sep 2019 09:43:28 +0100 |
While we are not currently using it we might as well keep the image
for later usage. So:
- update to a more recent snapshot
- clean up verbiage in commentary
- remove duplicate shell from a merge failure
Suggested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/dockerfiles/debian-sid.docker
b/tests/docker/dockerfiles/debian-sid.docker
index 513459ca7f8..2a1bcc33b24 100644
--- a/tests/docker/dockerfiles/debian-sid.docker
+++ b/tests/docker/dockerfiles/debian-sid.docker
@@ -1,25 +1,19 @@
#
# 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.
+# 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-20181011-slim
+FROM debian:sid-20190812-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"
+ # 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
--
2.20.1
- [Qemu-devel] [PULL 30/45] tests/docker: use --arch-only for installing deps, (continued)
- [Qemu-devel] [PULL 30/45] tests/docker: use --arch-only for installing deps, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 27/45] tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 37/45] .travis.yml: Cache Avocado cache, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 34/45] .travis.yml: Enable multiple caching features, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 12/45] tests/docker: set DEF_TARGET_LIST for some containers, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 45/45] travis.yml: Install libcap-dev for testing virito-9p, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 33/45] configure: check if --no-pie is supported first, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x86 hosts, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image,
Alex Bennée <=
- [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 35/45] .travis.yml: Increase cache timeout from 3min to 20min, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 39/45] .travis.yml: Enable ccache on OSX, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 17/45] tests/docker: move our HPPA cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 43/45] .travis.yml: Cache Linux/Clang jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 40/45] .travis.yml: Document how the build matrix use caches, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64, Alex Bennée, 2019/09/10