docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1454 from crazy-max/builder-fix-default

Browse Source 
builder: fix default docker context behavior
This commit is contained in:
CrazyMax 2022-12-07 11:03:06 +01:00 committed by GitHub
commit aa6fd3d888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builder/builder.go
View File

@ -97,9 +97,6 @@ func New(dockerCli command.Cli, opts ...Option) (_ *Builder, err error) {
return nil, err return nil, err
} }
} }
if b.NodeGroup.Name == "default" && len(b.NodeGroup.Nodes) == 1 {
b.NodeGroup.Name = b.NodeGroup.Nodes[0].Endpoint
}
if b.opts.validate { if b.opts.validate {
if err = b.Validate(); err != nil { if err = b.Validate(); err != nil {
return nil, err return nil, err
@ -111,16 +108,16 @@ func New(dockerCli command.Cli, opts ...Option) (_ *Builder, err error) {
// Validate validates builder context // Validate validates builder context
func (b *Builder) Validate() error { func (b *Builder) Validate() error {
if b.NodeGroup.Name == "default" && b.NodeGroup.Name != b.opts.dockerCli.CurrentContext() { if b.NodeGroup.DockerContext {
return errors.Errorf("use `docker --context=default buildx` to switch to default context")
}
list, err := b.opts.dockerCli.ContextStore().List() list, err := b.opts.dockerCli.ContextStore().List()
if err != nil { if err != nil {
return err return err
} }
currentContext := b.opts.dockerCli.CurrentContext()
for _, l := range list { for _, l := range list {
if l.Name == b.NodeGroup.Name && b.NodeGroup.Name != "default" { if l.Name == b.Name && l.Name != currentContext {
return errors.Errorf("use `docker --context=%s buildx` to switch to context %q", b.NodeGroup.Name, b.NodeGroup.Name) return errors.Errorf("use `docker --context=%s buildx` to switch to context %q", l.Name, l.Name)
}
} }
} }
return nil return nil

1
store/nodegroup.go
View File

@ -16,6 +16,7 @@ type NodeGroup struct {
Driver string Driver string
Nodes []Node Nodes []Node
Dynamic bool Dynamic bool
DockerContext bool
} }
type Node struct { type Node struct {

9
store/storeutil/storeutil.go
View File

@ -79,10 +79,6 @@ func GetNodeGroup(txn *store.Txn, dockerCli command.Cli, name string) (*store.No
return ng, nil return ng, nil
} }
if name == "default" {
name = dockerCli.CurrentContext()
}
list, err := dockerCli.ContextStore().List() list, err := dockerCli.ContextStore().List()
if err != nil { if err != nil {
return nil, err return nil, err
@ -90,13 +86,14 @@ func GetNodeGroup(txn *store.Txn, dockerCli command.Cli, name string) (*store.No
for _, l := range list { for _, l := range list {
if l.Name == name { if l.Name == name {
return &store.NodeGroup{ return &store.NodeGroup{
Name: "default", Name: name,
Nodes: []store.Node{ Nodes: []store.Node{
{ {
Name: "default", Name: name,
Endpoint: name, Endpoint: name,
}, },
}, },
DockerContext: true,
}, nil }, nil
} }
} }