mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-05-18 00:47:48 +08:00
5c31d855fd
Now clients can access the result of the solve, specifically the image id output. This is a useful refactor, as well as being required if we want to allow bake to invoke through the controller api. This also allows us to remove the quiet option from the API, since we can compute the required progress type outside of the controller, and can print the image id from the result of the solve. As a follow-up, we should also be able to remove the image id file output from the controller api, now that the client has access to it. Signed-off-by: Justin Chadwell <me@jedevc.com>
81 lines
2.0 KiB
Go
81 lines
2.0 KiB
Go
package local
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
|
|
"github.com/containerd/console"
|
|
"github.com/docker/buildx/build"
|
|
cbuild "github.com/docker/buildx/controller/build"
|
|
"github.com/docker/buildx/controller/control"
|
|
controllerapi "github.com/docker/buildx/controller/pb"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/moby/buildkit/client"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
func NewLocalBuildxController(ctx context.Context, dockerCli command.Cli) control.BuildxController {
|
|
return &localController{
|
|
dockerCli: dockerCli,
|
|
ref: "local",
|
|
}
|
|
}
|
|
|
|
type localController struct {
|
|
dockerCli command.Cli
|
|
ref string
|
|
resultCtx *build.ResultContext
|
|
}
|
|
|
|
func (b *localController) Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, w io.Writer, out console.File, progressMode string) (string, *client.SolveResponse, error) {
|
|
resp, res, err := cbuild.RunBuild(ctx, b.dockerCli, options, in, progressMode, nil)
|
|
if err != nil {
|
|
return "", nil, err
|
|
}
|
|
b.resultCtx = res
|
|
return b.ref, resp, nil
|
|
}
|
|
|
|
func (b *localController) Invoke(ctx context.Context, ref string, cfg controllerapi.ContainerConfig, ioIn io.ReadCloser, ioOut io.WriteCloser, ioErr io.WriteCloser) error {
|
|
if ref != b.ref {
|
|
return errors.Errorf("unknown ref %q", ref)
|
|
}
|
|
if b.resultCtx == nil {
|
|
return errors.New("no build result is registered")
|
|
}
|
|
ccfg := build.ContainerConfig{
|
|
ResultCtx: b.resultCtx,
|
|
Entrypoint: cfg.Entrypoint,
|
|
Cmd: cfg.Cmd,
|
|
Env: cfg.Env,
|
|
Tty: cfg.Tty,
|
|
Stdin: ioIn,
|
|
Stdout: ioOut,
|
|
Stderr: ioErr,
|
|
}
|
|
if !cfg.NoUser {
|
|
ccfg.User = &cfg.User
|
|
}
|
|
if !cfg.NoCwd {
|
|
ccfg.Cwd = &cfg.Cwd
|
|
}
|
|
return build.Invoke(ctx, ccfg)
|
|
}
|
|
|
|
func (b *localController) Kill(context.Context) error {
|
|
return nil // nop
|
|
}
|
|
|
|
func (b *localController) Close() error {
|
|
// TODO: cancel current build and invoke
|
|
return nil
|
|
}
|
|
|
|
func (b *localController) List(ctx context.Context) (res []string, _ error) {
|
|
return []string{b.ref}, nil
|
|
}
|
|
|
|
func (b *localController) Disconnect(ctx context.Context, key string) error {
|
|
return nil // nop
|
|
}
|