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

build: set target to local state

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2023-09-12 19:46:56 +02:00
parent cc6957d1cc
commit 2134a1e104
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/build.go
View File

@ -423,6 +423,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
} }
so := client.SolveOpt{ so := client.SolveOpt{
Ref: identity.NewID(),
Frontend: "dockerfile.v0", Frontend: "dockerfile.v0",
FrontendAttrs: map[string]string{}, FrontendAttrs: map[string]string{},
LocalDirs: map[string]string{}, LocalDirs: map[string]string{},
@ -665,12 +666,6 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
so.FrontendAttrs["ulimit"] = ulimits so.FrontendAttrs["ulimit"] = ulimits
} }
// remember local state like directory path that is not sent to buildkit
so.Ref = identity.NewID()
if err := saveLocalState(so, opt, node, configDir); err != nil {
return nil, nil, err
}
return &so, releaseF, nil return &so, releaseF, nil
} }
@ -748,6 +743,9 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := saveLocalState(so, k, opt, node, configDir); err != nil {
return nil, err
}
for k, v := range gitattrs { for k, v := range gitattrs {
so.FrontendAttrs[k] = v so.FrontendAttrs[k] = v
} }

10
build/localstate.go
View File

@ -8,15 +8,13 @@ import (
"github.com/moby/buildkit/client" "github.com/moby/buildkit/client"
) )
func saveLocalState(so client.SolveOpt, opt Options, node builder.Node, configDir string) error { func saveLocalState(so *client.SolveOpt, target string, opts Options, node builder.Node, configDir string) error {
var err error var err error
if so.Ref == "" { if so.Ref == "" {
return nil return nil
} }
lp := opts.Inputs.ContextPath
lp := opt.Inputs.ContextPath dp := opts.Inputs.DockerfilePath
dp := opt.Inputs.DockerfilePath
if lp != "" || dp != "" { if lp != "" || dp != "" {
if lp != "" { if lp != "" {
lp, err = filepath.Abs(lp) lp, err = filepath.Abs(lp)
@ -35,12 +33,12 @@ func saveLocalState(so client.SolveOpt, opt Options, node builder.Node, configDi
return err return err
} }
if err := ls.SaveRef(node.Builder, node.Name, so.Ref, localstate.State{ if err := ls.SaveRef(node.Builder, node.Name, so.Ref, localstate.State{
Target: target,
LocalPath: lp, LocalPath: lp,
DockerfilePath: dp, DockerfilePath: dp,
}); err != nil { }); err != nil {
return err return err
} }
} }
return nil return nil
} }

1
localstate/localstate.go
View File

@ -12,6 +12,7 @@ import (
const refsDir = "refs" const refsDir = "refs"
type State struct { type State struct {
Target string
LocalPath string LocalPath string
DockerfilePath string DockerfilePath string
} }