From e0e490d4c6211f9439b3a838ebf3e8eb637775d9 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 28 Feb 2018 14:39:47 +0000
Subject: [PATCH 1/7] tools/alpine: Build our own wireguard-tools package

Currently, there is a conflict in musl versions between stable
(used for tools/alpine) and edge (where wireguard-tools is).
This cased the tools/alpine build to fail.

With this commit we build our own wireguard-tools package,
using the  APKBUILD file from edge, against the libraries
libraries from stable. We then add the wireguard-tools package
to the mirror.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 tools/alpine/Dockerfile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
index e0eed32fd..6f27d36dc 100644
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@@ -12,8 +12,18 @@ RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \
    mkdir -p /mirror/$(uname -m) && \
    apk fetch --recursive -o /mirror/$(uname -m) $(apk info; cat /tmp/packages)
 
-# add the tools for WireGuard, since the kernel module is now included, but from edge/testing
-RUN apk fetch --recursive -o /mirror/$(uname -m) -X http://dl-cdn.alpinelinux.org/alpine/edge/testing -U wireguard-tools
+# It's tricky to mix edge/testing packages which sometimes leads to dependency conflicts.
+# wireguard-tools currently is only in edge, so here we build our own package using the
+# APKBUILD file from edge.
+RUN apk add alpine-sdk libmnl-dev curl && \
+    adduser -D builder && \
+    addgroup builder abuild && \
+    mkdir -p /wireguard && \
+    chmod 0777 /wireguard && \
+    cd /wireguard && \
+    curl -fsSLo APKBUILD https://git.alpinelinux.org/cgit/aports/plain/testing/wireguard-tools/APKBUILD && \
+    su -c "abuild-keygen -a -n && abuild -r" builder && \
+    cp /home/builder/packages/$(uname -m)/wireguard-tools-[0-9]*.apk /mirror/$(uname -m)
 
 # install abuild for signing
 RUN apk add --no-cache abuild

From 2a984165fbc4adde9a5bc338da7957197d4f7a90 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 28 Feb 2018 14:59:59 +0000
Subject: [PATCH 2/7] tools/alpine: Add a dummy versions.s390x file

This is temporary to un-break the build until we have pushed
a alpine base image for s390x.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 tools/alpine/versions.s390x | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 tools/alpine/versions.s390x

diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x
new file mode 100644
index 000000000..9e81a1b20
--- /dev/null
+++ b/tools/alpine/versions.s390x
@@ -0,0 +1,3 @@
+# linuxkit/alpine:9e4c5794dea51f7ad18d2d1d254093e709400b3a-s390x
+# DUMMY file to un-break the build until we have a s390x package
+# which should overwrite this file.

From 03c3fd65c3f4497580a6b424317f13dc5e2c2e9e Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 28 Feb 2018 15:12:40 +0000
Subject: [PATCH 3/7] tools/alpine: Fix push-manifest.sh

- On macOS, docker-credential-osxkeychain.bin was renamed to
  docker-credential-osxkeychain
- Pass --ignore-missing to the manifest-tool invocation.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 tools/alpine/push-manifest.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/alpine/push-manifest.sh b/tools/alpine/push-manifest.sh
index 1293caae7..08294ad48 100755
--- a/tools/alpine/push-manifest.sh
+++ b/tools/alpine/push-manifest.sh
@@ -46,7 +46,12 @@ EOF
 # we need them for notary on all platforms.
 case $(uname -s) in
     Darwin)
-        CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get)
+        # Prior to 2018-03-27 D4M used a .bin suffix on the keychain utility binary name. Support the old name for a while
+        if [ -f /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin ]; then
+            CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get)
+        else
+            CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain get)
+        fi    
         USER=$(echo "$CRED" | jq -r '.Username')
         PASS=$(echo "$CRED" | jq -r '.Secret')
         MT_ARGS="--username $USER --password $PASS"
@@ -65,7 +70,7 @@ case $(uname -s) in
 esac
 
 # Push manifest list
-OUT=$(manifest-tool $MT_ARGS push from-spec "$YAML")
+OUT=$(manifest-tool $MT_ARGS push from-spec --ignore-missing "$YAML")
 rm "$YAML"
 echo "$OUT"
 

From afbd3a93d92d482b8b3ac488fd9bd6f839090273 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 28 Feb 2018 15:14:17 +0000
Subject: [PATCH 4/7] tools/alpine: Update alpine base to latest

Also add s390x images

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 tools/alpine/versions.aarch64 |  48 +++---
 tools/alpine/versions.s390x   | 280 +++++++++++++++++++++++++++++++++-
 tools/alpine/versions.x86_64  |  38 ++---
 3 files changed, 320 insertions(+), 46 deletions(-)

diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64
index 651d10827..1a7feb7fb 100644
--- a/tools/alpine/versions.aarch64
+++ b/tools/alpine/versions.aarch64
@@ -1,10 +1,10 @@
-# linuxkit/alpine:9e4c5794dea51f7ad18d2d1d254093e709400b3a-arm64
+# linuxkit/alpine:714160cc12b9c890b1de98fa4f7d104987130fa5-arm64
 # automatically generated list of installed packages
 abuild-3.1.0-r3
 alpine-baselayout-3.0.5-r2
 alpine-keys-2.1-r1
 alsa-lib-1.1.4.1-r2
-apk-tools-2.8.2-r0
+apk-tools-2.9.1-r0
 argp-standalone-1.3-r2
 attr-2.4.47-r6
 attr-dev-2.4.47-r6
@@ -12,7 +12,7 @@ audit-2.7.7-r1
 audit-libs-2.7.7-r1
 autoconf-2.69-r0
 automake-1.15.1-r0
-bash-4.4.12-r2
+bash-4.4.19-r1
 bc-1.07.1-r0
 binutils-2.28-r3
 binutils-dev-2.28-r3
@@ -36,7 +36,7 @@ cmake-3.9.5-r0
 coreutils-8.28-r0
 cryptsetup-1.7.5-r1
 cryptsetup-libs-1.7.5-r1
-curl-7.57.0-r0
+curl-7.58.0-r1
 db-5.3.28-r0
 dbus-libs-1.10.24-r0
 device-mapper-libs-2.02.175-r0
@@ -76,7 +76,7 @@ gmp-6.1.2-r1
 gmp-dev-6.1.2-r1
 gnupg-2.2.3-r0
 gnutls-3.6.1-r0
-go-1.9.2-r1
+go-1.9.4-r0
 grep-3.1-r0
 guile-2.0.14-r0
 guile-libs-2.0.14-r0
@@ -110,13 +110,13 @@ libburn-1.4.8-r0
 libbz2-1.0.6-r6
 libc-dev-0.7.1-r0
 libc-utils-0.7.1-r0
-libc6-compat-1.1.18-r2
+libc6-compat-1.1.18-r3
 libcap-2.25-r1
 libcap-ng-0.7.8-r1
 libcap-ng-dev-0.7.8-r1
 libcom_err-1.43.7-r0
 libcrypto1.0-1.0.2n-r0
-libcurl-7.57.0-r0
+libcurl-7.58.0-r1
 libdrm-2.4.88-r0
 libedit-20170329.3.1-r3
 libelf-0.8.13-r3
@@ -156,13 +156,13 @@ libressl2.6-libcrypto-2.6.3-r0
 libressl2.6-libssl-2.6.3-r0
 libressl2.6-libtls-2.6.3-r0
 libsasl-2.1.26-r11
-libseccomp-2.3.2-r0
-libseccomp-dev-2.3.2-r0
+libseccomp-2.3.2-r1
+libseccomp-dev-2.3.2-r1
 libsmartcols-2.31-r0
 libssh2-1.8.0-r2
 libssl1.0-1.0.2n-r0
 libstdc++-6.4.0-r5
-libtasn1-4.12-r2
+libtasn1-4.12-r3
 libtirpc-1.0.1-r2
 libtirpc-dev-1.0.1-r2
 libtool-2.4.6-r4
@@ -189,9 +189,9 @@ mpfr-dev-3.1.5-r1
 mpfr3-3.1.5-r1
 mtools-4.0.18-r2
 multipath-tools-0.7.4-r0
-musl-1.1.18-r2
-musl-dev-1.1.18-r2
-musl-utils-1.1.18-r2
+musl-1.1.18-r3
+musl-dev-1.1.18-r3
+musl-utils-1.1.18-r3
 ncurses-dev-6.0_p20171125-r0
 ncurses-libs-6.0_p20171125-r0
 ncurses-terminfo-6.0_p20171125-r0
@@ -211,7 +211,7 @@ openssl-1.0.2n-r0
 openssl-dev-1.0.2n-r0
 opus-1.2.1-r1
 p11-kit-0.23.2-r2
-patch-2.7.5-r1
+patch-2.7.5-r2
 pax-utils-1.2.2-r1
 pcre-8.41-r1
 pcre2-10.30-r0
@@ -223,15 +223,15 @@ pixman-0.34.0-r3
 pkgconf-1.3.10-r0
 popt-1.16-r7
 python3-3.6.3-r9
-qemu-2.10.1-r2
-qemu-aarch64-2.10.1-r2
-qemu-arm-2.10.1-r2
-qemu-guest-agent-2.10.1-r2
-qemu-img-2.10.1-r2
-qemu-ppc64le-2.10.1-r2
-qemu-system-aarch64-2.10.1-r2
-qemu-system-arm-2.10.1-r2
-qemu-system-x86_64-2.10.1-r2
+qemu-2.10.1-r3
+qemu-aarch64-2.10.1-r3
+qemu-arm-2.10.1-r3
+qemu-guest-agent-2.10.1-r3
+qemu-img-2.10.1-r3
+qemu-ppc64le-2.10.1-r3
+qemu-system-aarch64-2.10.1-r3
+qemu-system-arm-2.10.1-r3
+qemu-system-x86_64-2.10.1-r3
 readline-7.0.003-r0
 rhash-libs-1.3.5-r1
 rpcbind-0.2.4-r0
@@ -267,7 +267,7 @@ vim-8.0.1359-r0
 wayland-libs-client-1.14.0-r2
 wayland-libs-cursor-1.14.0-r2
 wayland-libs-server-1.14.0-r2
-wireguard-tools-0.0.20180202-r0
+wireguard-tools-0.0.20180218-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r8
 xfsprogs-4.14.0-r0
diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x
index 9e81a1b20..fa7b93d74 100644
--- a/tools/alpine/versions.s390x
+++ b/tools/alpine/versions.s390x
@@ -1,3 +1,277 @@
-# linuxkit/alpine:9e4c5794dea51f7ad18d2d1d254093e709400b3a-s390x
-# DUMMY file to un-break the build until we have a s390x package
-# which should overwrite this file.
+# linuxkit/alpine:1050bc69eab6ab694a04ae16fcefa072215433f4-s390x
+# automatically generated list of installed packages
+abuild-3.1.0-r3
+alpine-baselayout-3.0.5-r2
+alpine-keys-2.1-r1
+alsa-lib-1.1.4.1-r2
+apk-tools-2.8.1-r2
+argp-standalone-1.3-r2
+attr-2.4.47-r6
+attr-dev-2.4.47-r6
+audit-2.7.7-r1
+audit-libs-2.7.7-r1
+autoconf-2.69-r0
+automake-1.15.1-r0
+bash-4.4.12-r2
+bc-1.07.1-r0
+binutils-2.28-r3
+binutils-dev-2.28-r3
+binutils-libs-2.28-r3
+bison-3.0.4-r0
+blkid-2.31-r0
+bridge-utils-1.6-r0
+bsd-compat-headers-0.7.1-r0
+btrfs-progs-4.13.2-r0
+btrfs-progs-dev-4.13.2-r0
+btrfs-progs-libs-4.13.2-r0
+build-base-0.5-r0
+busybox-1.27.2-r7
+busybox-initscripts-3.1-r2
+bzip2-1.0.6-r6
+ca-certificates-20171114-r0
+cdrkit-1.1.11-r2
+celt051-0.5.1.3-r0
+cifs-utils-6.7-r1
+cmake-3.9.5-r0
+coreutils-8.28-r0
+cryptsetup-1.7.5-r1
+cryptsetup-libs-1.7.5-r1
+curl-7.57.0-r0
+db-5.3.28-r0
+dbus-libs-1.10.24-r0
+device-mapper-libs-2.02.175-r0
+dhcpcd-6.11.5-r1
+diffutils-3.6-r0
+dosfstools-4.1-r1
+dtc-1.4.4-r0
+e2fsprogs-1.43.7-r0
+e2fsprogs-dev-1.43.7-r0
+e2fsprogs-extra-1.43.7-r0
+e2fsprogs-libs-1.43.7-r0
+ebtables-2.0.10.4-r2
+elfutils-dev-0.168-r1
+elfutils-libelf-0.168-r1
+ethtool-4.13-r0
+eudev-3.2.4-r1
+eudev-libs-3.2.4-r1
+expat-2.2.5-r0
+expect-5.45-r4
+fakeroot-1.21-r1
+file-5.32-r0
+findmnt-2.31-r0
+findutils-4.6.0-r0
+flex-2.6.4-r1
+fortify-headers-0.9-r0
+g++-6.4.0-r5
+gc-7.6.0-r1
+gcc-6.4.0-r5
+gdbm-1.13-r1
+gettext-0.19.8.1-r1
+gettext-asprintf-0.19.8.1-r1
+gettext-dev-0.19.8.1-r1
+gettext-libs-0.19.8.1-r1
+git-2.15.0-r1
+glib-2.54.2-r0
+gmp-6.1.2-r1
+gmp-dev-6.1.2-r1
+gnupg-2.2.3-r0
+gnutls-3.6.1-r0
+go-1.9.2-r1
+grep-3.1-r0
+guile-2.0.14-r0
+guile-libs-2.0.14-r0
+hvtools-4.11.9-r0
+installkernel-3.5-r0
+iperf3-3.2-r0
+iproute2-4.13.0-r0
+iptables-1.6.1-r1
+ipvsadm-1.29-r0
+isl-0.18-r0
+jansson-2.10-r0
+jq-1.5-r4
+json-c-0.12.1-r1
+keyutils-libs-1.5.10-r0
+kmod-24-r0
+krb5-conf-1.0-r1
+krb5-dev-1.15.2-r1
+krb5-libs-1.15.2-r1
+krb5-server-ldap-1.15.2-r1
+libacl-2.2.52-r3
+libaio-0.3.110-r1
+libarchive-3.3.2-r2
+libarchive-tools-3.3.2-r2
+libassuan-2.4.4-r0
+libatomic-6.4.0-r5
+libattr-2.4.47-r6
+libblkid-2.31-r0
+libburn-1.4.8-r0
+libbz2-1.0.6-r6
+libc-dev-0.7.1-r0
+libc-utils-0.7.1-r0
+libc6-compat-1.1.18-r2
+libcap-2.25-r1
+libcap-ng-0.7.8-r1
+libcap-ng-dev-0.7.8-r1
+libcom_err-1.43.7-r0
+libcrypto1.0-1.0.2n-r0
+libcurl-7.57.0-r0
+libdrm-2.4.88-r0
+libedit-20170329.3.1-r3
+libelf-0.8.13-r3
+libelf-dev-0.8.13-r3
+libepoxy-1.4.3-r1
+libevent-2.1.8-r2
+libfdisk-2.31-r0
+libffi-3.2.1-r4
+libgcc-6.4.0-r5
+libgcrypt-1.8.1-r0
+libgmpxx-6.1.2-r1
+libgomp-6.4.0-r5
+libgpg-error-1.27-r1
+libintl-0.19.8.1-r1
+libisoburn-1.4.8-r0
+libisofs-1.4.8-r0
+libjpeg-turbo-1.5.2-r0
+libksba-1.3.5-r0
+libldap-2.4.45-r3
+libltdl-2.4.6-r4
+libmagic-5.32-r0
+libmnl-1.0.4-r0
+libmount-2.31-r0
+libnfs-2.0.0-r0
+libnfsidmap-0.25-r1
+libnftnl-libs-1.0.8-r1
+libnl-1.1.4-r0
+libnl3-3.2.28-r1
+libogg-1.3.3-r1
+libpcap-1.8.1-r1
+libpng-1.6.34-r1
+libressl-2.6.3-r0
+libressl-dev-2.6.3-r0
+libressl2.6-libcrypto-2.6.3-r0
+libressl2.6-libssl-2.6.3-r0
+libressl2.6-libtls-2.6.3-r0
+libsasl-2.1.26-r11
+libseccomp-2.3.2-r0
+libseccomp-dev-2.3.2-r0
+libsmartcols-2.31-r0
+libssh2-1.8.0-r2
+libssl1.0-1.0.2n-r0
+libstdc++-6.4.0-r5
+libtasn1-4.12-r2
+libtirpc-1.0.1-r2
+libtirpc-dev-1.0.1-r2
+libtool-2.4.6-r4
+libunistring-0.9.7-r0
+libusb-1.0.21-r0
+libuuid-2.31-r0
+libuv-1.17.0-r0
+libverto-0.3.0-r0
+libxml2-2.9.7-r0
+linux-headers-4.4.6-r2
+lsscsi-0.28-r0
+lua5.2-libs-5.2.4-r4
+lz4-libs-1.8.0-r1
+lzip-1.19-r1
+lzo-2.10-r2
+m4-1.4.18-r0
+make-4.2.1-r0
+mesa-gbm-17.2.4-r1
+mpc1-1.0.3-r1
+mpc1-dev-1.0.3-r1
+mpfr-dev-3.1.5-r1
+mpfr3-3.1.5-r1
+mtools-4.0.18-r2
+multipath-tools-0.7.4-r0
+musl-1.1.18-r2
+musl-dev-1.1.18-r2
+musl-utils-1.1.18-r2
+ncurses-dev-6.0_p20170930-r0
+ncurses-libs-6.0_p20170930-r0
+ncurses-terminfo-6.0_p20170930-r0
+ncurses-terminfo-base-6.0_p20170930-r0
+nettle-3.3-r0
+nfs-utils-2.1.1-r4
+npth-1.5-r1
+oniguruma-6.6.1-r0
+open-iscsi-2.0.874-r0
+open-isns-lib-0.97-r2
+openntpd-6.2_p3-r0
+openrc-0.24.1-r4
+openssh-keygen-7.5_p1-r8
+openssh-server-7.5_p1-r8
+openssh-server-common-7.5_p1-r8
+openssl-1.0.2n-r0
+openssl-dev-1.0.2n-r0
+opus-1.2.1-r1
+p11-kit-0.23.2-r2
+patch-2.7.5-r1
+pax-utils-1.2.2-r1
+pcre-8.41-r1
+pcre2-10.30-r0
+pcsc-lite-libs-1.8.22-r0
+perl-5.26.1-r1
+pigz-2.3.4-r2
+pinentry-1.0.0-r0
+pixman-0.34.0-r3
+pkgconf-1.3.10-r0
+popt-1.16-r7
+python3-3.6.3-r9
+qemu-2.10.1-r2
+qemu-aarch64-2.10.1-r2
+qemu-arm-2.10.1-r2
+qemu-guest-agent-2.10.1-r2
+qemu-img-2.10.1-r2
+qemu-ppc64le-2.10.1-r2
+qemu-system-arm-2.10.1-r2
+qemu-system-s390x-2.10.1-r2
+qemu-system-x86_64-2.10.1-r2
+readline-7.0.003-r0
+rhash-libs-1.3.5-r1
+rpcbind-0.2.4-r0
+rsync-3.1.2-r7
+scanelf-1.2.2-r1
+sed-4.4-r1
+sfdisk-2.31-r0
+sg3_utils-1.42-r0
+sgdisk-1.0.3-r0
+slang-2.3.1a-r0
+slang-dev-2.3.1a-r0
+snappy-1.1.4-r2
+socat-1.7.3.2-r3
+spice-server-0.14.0-r6
+sqlite-libs-3.21.0-r0
+squashfs-tools-4.3-r4
+strace-4.19-r0
+sudo-1.8.21_p2-r1
+swig-3.0.12-r1
+talloc-2.1.10-r0
+tar-1.29-r1
+tcl-8.6.7-r0
+tcpdump-4.9.2-r1
+tini-0.16.1-r0
+tzdata-2017c-r0
+udev-init-scripts-32-r1
+usbredir-0.7.1-r0
+userspace-rcu-0.10.0-r0
+util-linux-2.31-r0
+util-linux-dev-2.31-r0
+vde2-libs-2.3.2-r8
+vim-8.0.1359-r0
+wayland-libs-client-1.14.0-r2
+wayland-libs-cursor-1.14.0-r2
+wayland-libs-server-1.14.0-r2
+wireguard-tools-0.0.20180218-r0
+wireless-tools-30_pre9-r0
+wpa_supplicant-2.6-r8
+xfsprogs-4.14.0-r0
+xfsprogs-extra-4.14.0-r0
+xfsprogs-libs-4.14.0-r0
+xorriso-1.4.8-r0
+xz-5.2.3-r1
+xz-dev-5.2.3-r1
+xz-libs-5.2.3-r1
+zfs-0.7.3-r0
+zfs-libs-0.7.3-r0
+zlib-1.2.11-r1
+zlib-dev-1.2.11-r1
diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64
index da0722bef..363fb3c95 100644
--- a/tools/alpine/versions.x86_64
+++ b/tools/alpine/versions.x86_64
@@ -1,10 +1,10 @@
-# linuxkit/alpine:b1a36f0dd41e60142dd84dab7cd333ce7da1d1f8-amd64
+# linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d-amd64
 # automatically generated list of installed packages
 abuild-3.1.0-r3
 alpine-baselayout-3.0.5-r2
 alpine-keys-2.1-r1
 alsa-lib-1.1.4.1-r2
-apk-tools-2.8.2-r0
+apk-tools-2.9.1-r0
 argp-standalone-1.3-r2
 attr-2.4.47-r6
 attr-dev-2.4.47-r6
@@ -36,7 +36,7 @@ cmake-3.9.5-r0
 coreutils-8.28-r0
 cryptsetup-1.7.5-r1
 cryptsetup-libs-1.7.5-r1
-curl-7.58.0-r0
+curl-7.58.0-r1
 db-5.3.28-r0
 dbus-libs-1.10.24-r0
 device-mapper-libs-2.02.175-r0
@@ -77,7 +77,7 @@ gmp-6.1.2-r1
 gmp-dev-6.1.2-r1
 gnupg-2.2.3-r0
 gnutls-3.6.1-r0
-go-1.9.2-r1
+go-1.9.4-r0
 grep-3.1-r0
 guile-2.0.14-r0
 guile-libs-2.0.14-r0
@@ -119,7 +119,7 @@ libcap-ng-0.7.8-r1
 libcap-ng-dev-0.7.8-r1
 libcom_err-1.43.7-r0
 libcrypto1.0-1.0.2n-r0
-libcurl-7.58.0-r0
+libcurl-7.58.0-r1
 libdrm-2.4.88-r0
 libedit-20170329.3.1-r3
 libelf-0.8.13-r3
@@ -161,13 +161,13 @@ libressl2.6-libcrypto-2.6.3-r0
 libressl2.6-libssl-2.6.3-r0
 libressl2.6-libtls-2.6.3-r0
 libsasl-2.1.26-r11
-libseccomp-2.3.2-r0
-libseccomp-dev-2.3.2-r0
+libseccomp-2.3.2-r1
+libseccomp-dev-2.3.2-r1
 libsmartcols-2.31-r0
 libssh2-1.8.0-r2
 libssl1.0-1.0.2n-r0
 libstdc++-6.4.0-r5
-libtasn1-4.12-r2
+libtasn1-4.12-r3
 libtirpc-1.0.1-r2
 libtirpc-dev-1.0.1-r2
 libtool-2.4.6-r4
@@ -188,7 +188,7 @@ lzo-2.10-r2
 m4-1.4.18-r0
 make-4.2.1-r0
 mesa-gbm-17.2.4-r1
-mkinitfs-3.2.0-r1
+mkinitfs-3.2.0-r2
 mpc1-1.0.3-r1
 mpc1-dev-1.0.3-r1
 mpfr-dev-3.1.5-r1
@@ -219,7 +219,7 @@ openssl-dev-1.0.2n-r0
 opus-1.2.1-r1
 ovmf-0.0.20170624-r0
 p11-kit-0.23.2-r2
-patch-2.7.5-r1
+patch-2.7.5-r2
 pax-utils-1.2.2-r1
 pcre-8.41-r1
 pcre2-10.30-r0
@@ -231,14 +231,14 @@ pixman-0.34.0-r3
 pkgconf-1.3.10-r0
 popt-1.16-r7
 python3-3.6.3-r9
-qemu-2.10.1-r2
-qemu-aarch64-2.10.1-r2
-qemu-arm-2.10.1-r2
-qemu-guest-agent-2.10.1-r2
-qemu-img-2.10.1-r2
-qemu-ppc64le-2.10.1-r2
-qemu-system-arm-2.10.1-r2
-qemu-system-x86_64-2.10.1-r2
+qemu-2.10.1-r3
+qemu-aarch64-2.10.1-r3
+qemu-arm-2.10.1-r3
+qemu-guest-agent-2.10.1-r3
+qemu-img-2.10.1-r3
+qemu-ppc64le-2.10.1-r3
+qemu-system-arm-2.10.1-r3
+qemu-system-x86_64-2.10.1-r3
 readline-7.0.003-r0
 rhash-libs-1.3.5-r1
 rpcbind-0.2.4-r0
@@ -275,7 +275,7 @@ vim-8.0.1359-r0
 wayland-libs-client-1.14.0-r2
 wayland-libs-cursor-1.14.0-r2
 wayland-libs-server-1.14.0-r2
-wireguard-tools-0.0.20180202-r0
+wireguard-tools-0.0.20180218-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r8
 xfsprogs-4.14.0-r0

From c08a2f19a82606cfe433f1f4202d0fef11b0e6db Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 28 Feb 2018 15:45:43 +0000
Subject: [PATCH 5/7] kernel: Update alpine base to latest

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 kernel/Dockerfile         | 2 +-
 kernel/Dockerfile.kconfig | 2 +-
 kernel/Dockerfile.zfs     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/Dockerfile b/kernel/Dockerfile
index 356f5f315..cd088f2bf 100644
--- a/kernel/Dockerfile
+++ b/kernel/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS kernel-build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS kernel-build
 RUN apk add \
     argp-standalone \
     automake \
diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig
index 8ae4023a0..ce7cdf94b 100644
--- a/kernel/Dockerfile.kconfig
+++ b/kernel/Dockerfile.kconfig
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS kernel-build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS kernel-build
 RUN apk add \
     argp-standalone \
     build-base \
diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs
index c7bda3391..7079a3d3f 100644
--- a/kernel/Dockerfile.zfs
+++ b/kernel/Dockerfile.zfs
@@ -1,6 +1,6 @@
 ARG IMAGE
 FROM ${IMAGE} AS ksrc
-FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build
+FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
 RUN apk add \
     attr-dev \
     autoconf \

From 02e695e925582d0f0a94c0b72eafbd8b331f0642 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 28 Feb 2018 16:36:19 +0000
Subject: [PATCH 6/7] scripts: Update push-manifest.sh with new location of key
 chain utility

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 scripts/push-manifest.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/push-manifest.sh b/scripts/push-manifest.sh
index 2115a6cb8..9600f7978 100755
--- a/scripts/push-manifest.sh
+++ b/scripts/push-manifest.sh
@@ -24,7 +24,12 @@ TAG=$(echo "$TARGET" | cut -d':' -f2)
 # we need them for notary on all platforms.
 case $(uname -s) in
     Darwin)
-        CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get)
+        # Prior to 2018-03-27 D4M used a .bin suffix on the keychain utility binary name. Support the old name for a while
+        if [ -f /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin ]; then
+            CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get)
+        else
+            CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain get)
+        fi
         USER=$(echo "$CRED" | jq -r '.Username')
         PASS=$(echo "$CRED" | jq -r '.Secret')
         MT_ARGS="--username $USER --password $PASS"

From 6d4905ba2a7b8502f8707cd5910103d058df16b8 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 28 Feb 2018 16:40:59 +0000
Subject: [PATCH 7/7] cmd: Update generated code.

The source script changed

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 src/cmd/linuxkit/pkglib/manifest_push_script.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/cmd/linuxkit/pkglib/manifest_push_script.go b/src/cmd/linuxkit/pkglib/manifest_push_script.go
index 7a80d159c..31b883c0b 100644
--- a/src/cmd/linuxkit/pkglib/manifest_push_script.go
+++ b/src/cmd/linuxkit/pkglib/manifest_push_script.go
@@ -27,7 +27,12 @@ TAG=$(echo "$TARGET" | cut -d':' -f2)
 # we need them for notary on all platforms.
 case $(uname -s) in
     Darwin)
-        CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get)
+        # Prior to 2018-03-27 D4M used a .bin suffix on the keychain utility binary name. Support the old name for a while
+        if [ -f /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin ]; then
+            CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get)
+        else
+            CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain get)
+        fi
         USER=$(echo "$CRED" | jq -r '.Username')
         PASS=$(echo "$CRED" | jq -r '.Secret')
         MT_ARGS="--username $USER --password $PASS"