Browse code

hack: restore bundling vpnkit on amd64

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2019/02/06 11:11:18
Showing 4 changed files
... ...
@@ -239,6 +239,7 @@ RUN cd /docker-py \
239 239
 	&& pip install yamllint==1.5.0 \
240 240
 	&& pip install -r test-requirements.txt
241 241
 COPY --from=rootlesskit /build/ /usr/local/bin/
242
+COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e /vpnkit /usr/local/bin/vpnkit.x86_64
242 243
 
243 244
 ENV PATH=/usr/local/cli:$PATH
244 245
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux
... ...
@@ -8,4 +8,5 @@ DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim'
8 8
 DOCKER_PROXY_BINARY_NAME='docker-proxy'
9 9
 DOCKER_INIT_BINARY_NAME='docker-init'
10 10
 DOCKER_ROOTLESSKIT_BINARY_NAME='rootlesskit'
11
+DOCKER_VPNKIT_BINARY_NAME='vpnkit'
11 12
 DOCKER_DAEMON_ROOTLESS_SH_BINARY_NAME='dockerd-rootless.sh'
... ...
@@ -20,6 +20,14 @@ copy_binaries() {
20 20
 			hash_files "$dir/$file"
21 21
 		fi
22 22
 	done
23
+
24
+	# vpnkit is amd64 only
25
+	if which "vpnkit.$(uname -m)" 2>&1 >/dev/null; then
26
+		cp -f `which "vpnkit.$(uname -m)"` "$dir/vpnkit"
27
+		if [ "$hash" == "hash" ]; then
28
+			hash_files "$dir/vpnkit"
29
+		fi
30
+	fi
23 31
 }
24 32
 
25 33
 [ -z "$KEEPDEST" ] && rm -rf "$DEST"
... ...
@@ -28,4 +28,7 @@ install_binary() {
28 28
 	install_binary "${DEST}/${DOCKER_INIT_BINARY_NAME}"
29 29
 	install_binary "${DEST}/${DOCKER_ROOTLESSKIT_BINARY_NAME}"
30 30
 	install_binary "${DEST}/${DOCKER_DAEMON_ROOTLESS_SH_BINARY_NAME}"
31
+	if [ -f "${DEST}/${DOCKER_VPNKIT_BINARY_NAME}" ]; then
32
+		install_binary "${DEST}/${DOCKER_VPNKIT_BINARY_NAME}"
33
+	fi
31 34
 )