From c01f72d55654d3a77f7d8a37110d5d5b01167ef9 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Thu, 7 May 2020 11:49:51 +0100
Subject: [PATCH 1/2] Add Risc-V support and only ship binaries we use

Ported from https://github.com/docker/binfmt/pull/21

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 pkg/binfmt/Dockerfile                    | 4 +++-
 pkg/binfmt/etc/binfmt.d/00_linuxkit.conf | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile
index 917b339e5..3a4fc7826 100644
--- a/pkg/binfmt/Dockerfile
+++ b/pkg/binfmt/Dockerfile
@@ -4,7 +4,9 @@ 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 && \
     mv /usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le && \
-    mv /usr/bin/qemu-s390x-static /usr/bin/qemu-s390x
+    mv /usr/bin/qemu-s390x-static /usr/bin/qemu-s390x && \
+    mv /usr/bin/qemu-riscv64-static /usr/bin/qemu-riscv64 && \
+    rm /usr/bin/qemu-*-static
 
 FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS mirror
 
diff --git a/pkg/binfmt/etc/binfmt.d/00_linuxkit.conf b/pkg/binfmt/etc/binfmt.d/00_linuxkit.conf
index a87e9ff00..6b6bf296c 100644
--- a/pkg/binfmt/etc/binfmt.d/00_linuxkit.conf
+++ b/pkg/binfmt/etc/binfmt.d/00_linuxkit.conf
@@ -6,3 +6,4 @@
 :qemu-arm:M:0:\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:CF
 :qemu-ppc64le:M:0:\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00:/usr/bin/qemu-ppc64le:CF
 :qemu-s390x:M:0:\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x:CF
+:qemu-riscv64:M:0:\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-riscv64:CF

From c63ec77e3ff83261c56ed8e03789421f23897a2d Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Thu, 7 May 2020 11:58:44 +0100
Subject: [PATCH 2/2] Update binfmt package

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 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 432c162d1..75932c1be 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:4ea3b9b0938cbd19834c096aa31ff475cc75d281
+    image: linuxkit/binfmt:5d33e7346e79f9c13a73c6952669e47a53b063d4
   # 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 c32f1256b..4450388bb 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:4ea3b9b0938cbd19834c096aa31ff475cc75d281
+    image: linuxkit/binfmt:5d33e7346e79f9c13a73c6952669e47a53b063d4
   - name: test
     image: alpine:3.11
     binds: