Re: [Qemu-devel] [PATCH] tests/docker: update Debian Sid image

[Philippe Mathieu-Daudé]

On 9/9/19 11:48 AM, Alex Bennée wrote:
> 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

Thank you :)

FYI I'm using this image to do gcc9 test builds.

> 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>

> ---
>  tests/docker/dockerfiles/debian-sid.docker | 24 ++++++++--------------
>  1 file changed, 9 insertions(+), 15 deletions(-)
> 
> 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
>