From 7d071f52b160c47d8a055a9770f0010e705851a2 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Tue, 17 Jan 2017 15:04:31 +0000
Subject: [PATCH] Use Alpine for qemu-static

Static qemu-user is now available in Alpine edge. Includes the
patch for Golang crashing due to non standard signal usage.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 alpine/base/binfmt/Makefile                  |  6 +++---
 alpine/base/binfmt/etc/binfmt.d/00_moby.conf |  6 +++---
 alpine/base/qemu-user-static/Dockerfile      | 12 ++++++++----
 alpine/base/qemu-user-static/Makefile        |  2 +-
 alpine/containers/binfmt/Makefile            |  4 ++--
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/alpine/base/binfmt/Makefile b/alpine/base/binfmt/Makefile
index 40267dafe..82afb3614 100644
--- a/alpine/base/binfmt/Makefile
+++ b/alpine/base/binfmt/Makefile
@@ -1,6 +1,6 @@
-# Tag 7a07de557d7f6ae3d72873c32bfb4c51c7687d03
-QEMU_IMAGE=mobylinux/qemu-user-static@sha256:cbeba25809c7c3feebc9e20522145e33d8abe5956674afa52814fc57c6644497
-QEMU_FILES=qemu-arm-static qemu-aarch64-static qemu-ppc64le-static
+# Tag da39a3ee5e6b4b0d3255bfef95601890afd80709
+QEMU_IMAGE=mobylinux/qemu-user-static@sha256:6c022f700dc6c263c9107c08aa29b4eae3b43b7b7594b7be3e421f69b51f53e5
+QEMU_FILES=qemu-arm qemu-aarch64 qemu-ppc64le
 QEMU_BINARIES=$(addprefix usr/bin/,$(QEMU_FILES))
 
 # Tag: 6075d4b9c5fe30e19581f1b7ef1813f3041cca32
diff --git a/alpine/base/binfmt/etc/binfmt.d/00_moby.conf b/alpine/base/binfmt/etc/binfmt.d/00_moby.conf
index 6e313953d..5f138e557 100644
--- a/alpine/base/binfmt/etc/binfmt.d/00_moby.conf
+++ b/alpine/base/binfmt/etc/binfmt.d/00_moby.conf
@@ -1,3 +1,3 @@
-:qemu-aarch64:M:0:\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-aarch64-static:CF
-: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-static: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\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00:/usr/bin/qemu-ppc64le-static:CF
+:qemu-aarch64:M:0:\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-aarch64:CF
+: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\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00:/usr/bin/qemu-ppc64le:CF
diff --git a/alpine/base/qemu-user-static/Dockerfile b/alpine/base/qemu-user-static/Dockerfile
index 14b72c406..5f2160ead 100644
--- a/alpine/base/qemu-user-static/Dockerfile
+++ b/alpine/base/qemu-user-static/Dockerfile
@@ -1,4 +1,8 @@
-FROM debian:testing
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -yq upgrade && apt-get install -yq qemu-user-static
+FROM alpine:edge
+RUN \
+  apk update && apk upgrade && \
+  apk add \
+  qemu-aarch64 \
+  qemu-arm \
+  qemu-ppc64le \
+  && true
diff --git a/alpine/base/qemu-user-static/Makefile b/alpine/base/qemu-user-static/Makefile
index 3af40352e..e1f4c0ffb 100644
--- a/alpine/base/qemu-user-static/Makefile
+++ b/alpine/base/qemu-user-static/Makefile
@@ -1,6 +1,6 @@
 .PHONY: tag push
 
-BASE=debian:testing
+BASE=alpine:edge
 IMAGE=qemu-user-static
 
 default: push
diff --git a/alpine/containers/binfmt/Makefile b/alpine/containers/binfmt/Makefile
index 278fddb74..d2c248197 100644
--- a/alpine/containers/binfmt/Makefile
+++ b/alpine/containers/binfmt/Makefile
@@ -1,5 +1,5 @@
-# Tag: 8c52d6a837be80b4e0535b5d9e693b604e970f7d
-BINFMT_IMAGE=mobylinux/binfmt@sha256:4f1d647bfdd46cf015f7c7b161687fe9557647b4542245d45f714774446730ed
+# Tag: 76d5101db8a98f469e2023e44be78bd5df44a674
+BINFMT_IMAGE=mobylinux/binfmt@sha256:53f3d3366366daad17ab9ed2421a888b43c49048dd04c61dfa132d5f4d8fb1ab
 
 default: config.json