docker
/
buildx
mirror of https://github.com/docker/buildx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1255 from crazy-max/docker-api 

docker api: use helper to parse context docker endpoint metadata
This commit is contained in:
CrazyMax 2022-11-29 12:16:52 +01:00 committed by GitHub
parent 29f2c49374 0defb614a4
commit eba49fdefd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
commands/util.go
View File

@ -104,8 +104,6 @@ func driversForNodeGroup(ctx context.Context, dockerCli command.Cli, ng *store.N
di.Err = err di.Err = err
return nil return nil
} }
// TODO: replace the following line with dockerclient.WithAPIVersionNegotiation option in clientForEndpoint
dockerapi.NegotiateAPIVersion(ctx)
contextStore := dockerCli.ContextStore() contextStore := dockerCli.ContextStore()
@ -164,13 +162,9 @@ func clientForEndpoint(dockerCli command.Cli, name string) (dockerclient.APIClie
} }
for _, l := range list { for _, l := range list {
if l.Name == name { if l.Name == name {
dep, ok := l.Endpoints["docker"] epm, err := docker.EndpointFromContext(l)
if !ok { if err != nil {
return nil, errors.Errorf("context %q does not have a Docker endpoint", name) return nil, err
}
epm, ok := dep.(docker.EndpointMeta)
if !ok {
return nil, errors.Errorf("endpoint %q is not of type EndpointMeta, %T", dep, dep)
} }
ep, err := docker.WithTLSData(dockerCli.ContextStore(), name, epm) ep, err := docker.WithTLSData(dockerCli.ContextStore(), name, epm)
if err != nil { if err != nil {