From e3a25bbf5be2fc720b4362f9ed310b33fc80d6b8 Mon Sep 17 00:00:00 2001 From: Magnus Skjegstad Date: Thu, 15 Jun 2017 19:25:08 +0100 Subject: [PATCH] pkg/docker-ce: add vpnkit-expose-port vpnkit-expose-port is the dockerd userland proxy used to expose forwarding ports with vpnkit. This adds the binary to the image in /usr/bin/vpnkit-expose-port, but does not enable it by default. Signed-off-by: Magnus Skjegstad --- pkg/docker-ce/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/docker-ce/Dockerfile b/pkg/docker-ce/Dockerfile index 639156913..cf5f235c7 100644 --- a/pkg/docker-ce/Dockerfile +++ b/pkg/docker-ce/Dockerfile @@ -17,8 +17,10 @@ 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:883de832c2c3cb72cd9b01e3f7bd788649e0f2c2 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