From d2f55af35ce931d381c0c3ddb5cdf2042c2d67b2 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 4 May 2020 16:22:52 +0100 Subject: [PATCH 1/2] Update to Qemu 4.2.0 from Debian testing This has fixed a lot of outstanding emulation issues, see comments in https://github.com/docker/binfmt/pull/24 Signed-off-by: Justin Cormack --- pkg/binfmt/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 005094076..917b339e5 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,5 +1,5 @@ -# Use Debian stretch until https://bugs.alpinelinux.org/issues/8131 is resolved. -FROM debian@sha256:de3eac83cd481c04c5d6c7344cd7327625a1d8b2540e82a8231b5675cef0ae5f AS qemu +# Use Debian testing Qemu 4.2.0 until https://bugs.alpinelinux.org/issues/8131 is resolved. +FROM debian@sha256:79f148e13b4c596d4ad7fd617aba3630e37cf04f04538699341ed1267bd61a23 AS qemu RUN apt-get update && apt-get install -y qemu-user-static && \ mv /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 && \ mv /usr/bin/qemu-arm-static /usr/bin/qemu-arm && \ From 3887a281b22973a902065937e0fb922efd8610f4 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 6 May 2020 20:03:50 +0100 Subject: [PATCH 2/2] Update packages Signed-off-by: Justin Cormack --- examples/docker-for-mac.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index feb251d9f..14ecd0d8c 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -17,7 +17,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:697f996868d6625a78bbbefb199d7b6b6ae3533a - name: binfmt - image: linuxkit/binfmt:94d59bc179c7a9155d8593a974d499352b70bfd5 + image: linuxkit/binfmt:4ea3b9b0938cbd19834c096aa31ff475cc75d281 # Format and mount the disk image in /var/lib/docker - name: format image: linuxkit/format:0b75e494eea0312f3015e6c6f7c5927620d56c96 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 2693cace0..4f66335a3 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 onboot: - name: binfmt - image: linuxkit/binfmt:94d59bc179c7a9155d8593a974d499352b70bfd5 + image: linuxkit/binfmt:4ea3b9b0938cbd19834c096aa31ff475cc75d281 - name: test image: alpine:3.11 binds: