openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests/docker: update Debian Sid image 

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é <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Alex Bennée 2019-09-09 10:43:46 +01:00
parent 8a4daee5f9
commit a3c1f1283b
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/docker/dockerfiles/debian-sid.docker
View File

@ -1,25 +1,19 @@
# #
# Debian Sid Base # Debian Sid Base
# #
# A number of our guests exist as ports only. We can either use the # Currently we can build all our guests with cross-compilers in the
# ports repo or get everything from Sid. However Sid is a rolling # latest Debian release (Buster). However new compilers will first
# distro which may be broken at any particular time. If you are # arrive in Sid. However Sid is a rolling distro which may be broken
# unlucky and try and build your images while gcc is in the process of # at any particular time. To try and mitigate this we use Debian's
# being uploaded this can fail. Your only recourse is to try again in # snapshot archive which provides a "stable" view of what state Sid
# a few hours when the repos have re-synced. Once built however you # was in.
# 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 # 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) # Use a snapshot known to work (see http://snapshot.debian.org/#Usage)
ENV DEBIAN_SNAPSHOT_DATE "20181030" 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
# 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 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 # Duplicate deb line as deb-src