From a148a8aa458ecb55f583deffbac5efb2be422424 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 1 Jul 2017 12:11:03 +0100 Subject: [PATCH] pkg: Fix docker-ce package As of commit b2439251dda ("blueprints: update docker-for-mac.yml to latest vpnkit packages") the docker-ce package does not need the vpnkit-expose-port binary anymore. It was also removed from the linuxkit/vpnkit-forwarder forwarder package with commit f48a2bfe12 ("pkg: update vpnkit-forwarder") causing the docker-ce package build to fail. This commit fixes this by removing the linuxkit/vpnkit-forwarder package from the docker-ce package build. Signed-off-by: Rolf Neugebauer --- pkg/docker-ce/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/docker-ce/Dockerfile b/pkg/docker-ce/Dockerfile index 07ffcf2b3..fd741e1de 100644 --- a/pkg/docker-ce/Dockerfile +++ b/pkg/docker-ce/Dockerfile @@ -17,10 +17,8 @@ RUN apk add --no-cache --initdb -p /out \ xz RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/vpnkit-forwarder:e2776b82ddfe82ed7f90e55d7a2b424e62e9a279 AS vpnkit FROM scratch COPY --from=mirror /out/ / -COPY --from=vpnkit /vpnkit-expose-port /usr/bin/vpnkit-expose-port # set up Docker group # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box