From 20e8572a4c6b078c6199d6ac2010b8a0d381ef5c Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Tue, 5 Feb 2019 18:11:18 -0800
Subject: [PATCH] hack: restore bundling vpnkit on amd64

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 Dockerfile               | 1 +
 hack/make/.binary-setup  | 1 +
 hack/make/binary-daemon  | 8 ++++++++
 hack/make/install-binary | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 6516403acf..b0e304d200 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -239,6 +239,7 @@ RUN cd /docker-py \
 	&& pip install yamllint==1.5.0 \
 	&& pip install -r test-requirements.txt
 COPY --from=rootlesskit /build/ /usr/local/bin/
+COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e /vpnkit /usr/local/bin/vpnkit.x86_64
 
 ENV PATH=/usr/local/cli:$PATH
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux
diff --git a/hack/make/.binary-setup b/hack/make/.binary-setup
index 43e4b2cdc1..7faeca3efb 100644
--- a/hack/make/.binary-setup
+++ b/hack/make/.binary-setup
@@ -8,4 +8,5 @@ DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim'
 DOCKER_PROXY_BINARY_NAME='docker-proxy'
 DOCKER_INIT_BINARY_NAME='docker-init'
 DOCKER_ROOTLESSKIT_BINARY_NAME='rootlesskit'
+DOCKER_VPNKIT_BINARY_NAME='vpnkit'
 DOCKER_DAEMON_ROOTLESS_SH_BINARY_NAME='dockerd-rootless.sh'
diff --git a/hack/make/binary-daemon b/hack/make/binary-daemon
index dbf51b1426..e8b4ad0de8 100644
--- a/hack/make/binary-daemon
+++ b/hack/make/binary-daemon
@@ -20,6 +20,14 @@ copy_binaries() {
 			hash_files "$dir/$file"
 		fi
 	done
+
+	# vpnkit is amd64 only
+	if which "vpnkit.$(uname -m)" 2>&1 >/dev/null; then
+		cp -f `which "vpnkit.$(uname -m)"` "$dir/vpnkit"
+		if [ "$hash" == "hash" ]; then
+			hash_files "$dir/vpnkit"
+		fi
+	fi
 }
 
 [ -z "$KEEPDEST" ] && rm -rf "$DEST"
diff --git a/hack/make/install-binary b/hack/make/install-binary
index 4ad2fb1d75..04c4f2fadc 100644
--- a/hack/make/install-binary
+++ b/hack/make/install-binary
@@ -28,4 +28,7 @@ install_binary() {
 	install_binary "${DEST}/${DOCKER_INIT_BINARY_NAME}"
 	install_binary "${DEST}/${DOCKER_ROOTLESSKIT_BINARY_NAME}"
 	install_binary "${DEST}/${DOCKER_DAEMON_ROOTLESS_SH_BINARY_NAME}"
+	if [ -f "${DEST}/${DOCKER_VPNKIT_BINARY_NAME}" ]; then
+		install_binary "${DEST}/${DOCKER_VPNKIT_BINARY_NAME}"
+	fi
 )