From f48a2bfe12eb0e40c55a8ea77b1e9d2865a20ce1 Mon Sep 17 00:00:00 2001 From: Magnus Skjegstad Date: Thu, 29 Jun 2017 13:59:15 +0200 Subject: [PATCH] pkg: update vpnkit-forwarder Update to latest commit and don't include the binaries that are now in vpnkit-expose-port. Signed-off-by: Magnus Skjegstad --- pkg/vpnkit-forwarder/Dockerfile | 5 ++--- pkg/vpnkit-forwarder/README.md | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile index 65ab82b22..dd003c428 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -2,15 +2,14 @@ FROM linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin -ENV COMMIT=2d6d82167cf81c665c05d1425a79adfbc1a71177 +ENV COMMIT=db7b7b0f8147f29360d69dc81af9e2877647f0de RUN git clone https://github.com/moby/vpnkit.git /go/src/github.com/moby/vpnkit && \ cd /go/src/github.com/moby/vpnkit && \ git checkout $COMMIT && \ cd go && \ - make all + make build/vpnkit-forwarder.linux FROM scratch COPY --from=mirror /go/src/github.com/moby/vpnkit/go/build/vpnkit-forwarder.linux /vpnkit-forwarder -COPY --from=mirror /go/src/github.com/moby/vpnkit/go/build/vpnkit-expose-port.linux /vpnkit-expose-port CMD ["/vpnkit-forwarder"] diff --git a/pkg/vpnkit-forwarder/README.md b/pkg/vpnkit-forwarder/README.md index e0d1a6b8a..2c61cb388 100644 --- a/pkg/vpnkit-forwarder/README.md +++ b/pkg/vpnkit-forwarder/README.md @@ -1,9 +1,7 @@ ### vpnkit-forwarder -This package provides `vpnkit-forwarder` and `vpnkit-expose-port` from [vpnkit](http://github.com/moby/vpnkit.git). +This package provides `vpnkit-forwarder` from [vpnkit](http://github.com/moby/vpnkit.git). -`vpnkit-forwarder` is a forwarding daemon used by Docker for Desktop to forward ports from Docker containers to the host via VSOCK. +`vpnkit-forwarder` is a forwarding daemon used by Docker for Desktop to forward ports from Docker containers to the host via VSOCK. -`vpnkit-expose-port` is a userland proxy that opens ports by demand. - -To coordinate with `vpnkit` both tools require access to the 9P port configuration mount point. +To coordinate with `vpnkit` it requires access to the 9P port configuration mount point.