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

Remote driver connhelpers #1134

Merged
merged 3 commits into from
May 31, 2022
Merged

Conversation

jedevc
Copy link
Collaborator

@jedevc jedevc commented May 17, 2022

This patch pulls in the ssh and docker-container connhelpers from buildkit to allow connections over ssh and to managed docker-containers.

I was thinking we pull in at least the docker-container and ssh helpers, and maybe the kubepod one?

I've also attempted to update the buildkit dependency to pull in moby/buildkit#2843 - though in doing so that's also bumped some other things, so not entirely sure whether that's the right way to go.

@jedevc jedevc requested a review from tonistiigi May 17, 2022 15:23
@jedevc jedevc force-pushed the remote-driver-connhelpers branch from 12bb4bc to 447be8b Compare May 17, 2022 15:33
@tonistiigi
Copy link
Member

I was thinking we pull in at least the docker-container and ssh helpers, and maybe the kubepod one?

Yes, include the k8s one too.

@jedevc jedevc force-pushed the remote-driver-connhelpers branch from 447be8b to 96eccab Compare May 18, 2022 09:31
@jedevc jedevc marked this pull request as ready for review May 18, 2022 09:46
@@ -5,8 +5,8 @@ go 1.17
require (
github.com/compose-spec/compose-go v1.2.4
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.6.3-0.20220401172941-5ff8fce1fcc6
Copy link
Collaborator

Choose a reason for hiding this comment

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

not sure this change is needed in this PR

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

buildkit master has updated to containerd v1.6.4, I think that's why this gets bumped? https://github.com/moby/buildkit/blob/master/go.mod#L11

cmd/buildx/main.go Outdated Show resolved Hide resolved
docs/guides/remote-builder.md Outdated Show resolved Hide resolved
@jedevc jedevc force-pushed the remote-driver-connhelpers branch from a25e86b to 3ff06ba Compare May 25, 2022 09:20
Update modules:

  go mod edit -require github.com/moby/buildkit@master
  go mod tidy -compat=1.17 && ./hack/update-vendor

Signed-off-by: Justin Chadwell <me@jedevc.com>
@jedevc jedevc force-pushed the remote-driver-connhelpers branch from 3ff06ba to 1406ff1 Compare May 25, 2022 09:38
Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
@jedevc jedevc requested a review from tonistiigi May 25, 2022 11:15
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