Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkg/docker-ce: add vpnkit-expose-port #2048

Merged
merged 2 commits into from
Jun 15, 2017

Conversation

MagnusS
Copy link
Contributor

@MagnusS MagnusS commented Jun 15, 2017

Adds vpnkit-expose-port to the docker-ce image.

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 magnus@skjegstad.com
ralph-nhspca-2926

@@ -1,3 +1,4 @@
FROM linuxkit/vpnkit-forwarder:883de832c2c3cb72cd9b01e3f7bd788649e0f2c2 AS vpnkit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think its more logical to add this just before FROM scratch so we consistently do the FROM linuxkit/alpine at the top of files.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok - moved and updated

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 <magnus@skjegstad.com>
@justincormack
Copy link
Member

This needs to update the docker-ce hash in the examples that use it once its pushed

Copy link
Contributor

@riyazdf riyazdf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code LGTM - I pushed and signed linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848 if you can update the ymls

@MagnusS
Copy link
Contributor Author

MagnusS commented Jun 15, 2017

@riyazdf thanks!

yml files updated

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
@MagnusS
Copy link
Contributor Author

MagnusS commented Jun 15, 2017

Ah missed one - should be all now

@riyazdf
Copy link
Contributor

riyazdf commented Jun 15, 2017

@MagnusS: thanks! I think there's also one more usage in projects/kubernetes/image-cache/Dockerfile

@MagnusS
Copy link
Contributor Author

MagnusS commented Jun 15, 2017

@riyazdf that was the one I missed - should be in the last update

@riyazdf
Copy link
Contributor

riyazdf commented Jun 15, 2017

👍 needed a refresh! All good :)

Copy link
Contributor

@riyazdf riyazdf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on green

@justincormack justincormack merged commit 684b77d into linuxkit:master Jun 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants