diff options
| author | Peter Maydell | 2019-01-10 15:13:56 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-10 15:13:56 +0100 |
| commit | b7744b861bcce6909a39a58b6bba6b0fb175fc4e (patch) | |
| tree | 129662564286f3779bcd1ae3205c7f7cb438f4f9 /tests/docker | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.0-20190109' into... (diff) | |
| parent | docker: Use a stable snapshot for Debian Sid (diff) | |
| download | qemu-b7744b861bcce6909a39a58b6bba6b0fb175fc4e.tar.gz qemu-b7744b861bcce6909a39a58b6bba6b0fb175fc4e.tar.xz qemu-b7744b861bcce6909a39a58b6bba6b0fb175fc4e.zip | |
Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging
Block/testing patches
v2: Fix URL.
Drop BSD patch.
# gpg: Signature made Wed 09 Jan 2019 01:51:47 GMT
# gpg: using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/staging-pull-request:
docker: Use a stable snapshot for Debian Sid
block/nvme: optimize the performance of nvme driver based on vfio-pci
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/debian-sid.docker | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker index 9a3d168705..4e4cda0ba5 100644 --- a/tests/docker/dockerfiles/debian-sid.docker +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -13,6 +13,10 @@ FROM debian:sid-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 + # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list |