mirror of https://github.com/docker/buildx.git
controller: move controllers out of commands into separate package
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
parent
cb94298a02
commit
a9fd128910
|
@ -10,7 +10,7 @@ import (
|
||||||
"github.com/docker/buildx/bake"
|
"github.com/docker/buildx/bake"
|
||||||
"github.com/docker/buildx/build"
|
"github.com/docker/buildx/build"
|
||||||
"github.com/docker/buildx/builder"
|
"github.com/docker/buildx/builder"
|
||||||
controllerapi "github.com/docker/buildx/commands/controller/pb"
|
controllerapi "github.com/docker/buildx/controller/pb"
|
||||||
"github.com/docker/buildx/util/buildflags"
|
"github.com/docker/buildx/util/buildflags"
|
||||||
"github.com/docker/buildx/util/confutil"
|
"github.com/docker/buildx/util/confutil"
|
||||||
"github.com/docker/buildx/util/dockerutil"
|
"github.com/docker/buildx/util/dockerutil"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/csv"
|
"encoding/csv"
|
||||||
|
@ -9,40 +8,28 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/containerd/console"
|
"github.com/containerd/console"
|
||||||
"github.com/docker/buildx/build"
|
"github.com/docker/buildx/controller"
|
||||||
"github.com/docker/buildx/builder"
|
cbuild "github.com/docker/buildx/controller/build"
|
||||||
controllerapi "github.com/docker/buildx/commands/controller/pb"
|
"github.com/docker/buildx/controller/control"
|
||||||
|
controllerapi "github.com/docker/buildx/controller/pb"
|
||||||
"github.com/docker/buildx/monitor"
|
"github.com/docker/buildx/monitor"
|
||||||
"github.com/docker/buildx/store"
|
"github.com/docker/buildx/store"
|
||||||
"github.com/docker/buildx/store/storeutil"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/util/buildflags"
|
|
||||||
"github.com/docker/buildx/util/confutil"
|
|
||||||
"github.com/docker/buildx/util/dockerutil"
|
|
||||||
"github.com/docker/buildx/util/ioset"
|
"github.com/docker/buildx/util/ioset"
|
||||||
"github.com/docker/buildx/util/platformutil"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/buildx/util/tracing"
|
"github.com/docker/buildx/util/tracing"
|
||||||
"github.com/docker/cli-docs-tool/annotation"
|
"github.com/docker/cli-docs-tool/annotation"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/config"
|
|
||||||
dockeropts "github.com/docker/cli/opts"
|
dockeropts "github.com/docker/cli/opts"
|
||||||
"github.com/docker/distribution/reference"
|
|
||||||
"github.com/docker/docker/pkg/ioutils"
|
"github.com/docker/docker/pkg/ioutils"
|
||||||
"github.com/docker/go-units"
|
"github.com/docker/go-units"
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/moby/buildkit/session/auth/authprovider"
|
|
||||||
"github.com/moby/buildkit/solver/errdefs"
|
|
||||||
"github.com/moby/buildkit/util/appcontext"
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/moby/buildkit/util/grpcerrors"
|
"github.com/moby/buildkit/util/grpcerrors"
|
||||||
"github.com/morikuni/aec"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
@ -50,15 +37,11 @@ import (
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
)
|
)
|
||||||
|
|
||||||
const defaultTargetName = "default"
|
|
||||||
|
|
||||||
type buildOptions struct {
|
type buildOptions struct {
|
||||||
progress string
|
progress string
|
||||||
invoke string
|
invoke string
|
||||||
serverConfig string
|
|
||||||
root string
|
|
||||||
detach bool
|
|
||||||
controllerapi.BuildOptions
|
controllerapi.BuildOptions
|
||||||
|
control.ControlOptions
|
||||||
}
|
}
|
||||||
|
|
||||||
func runBuild(dockerCli command.Cli, in buildOptions) error {
|
func runBuild(dockerCli command.Cli, in buildOptions) error {
|
||||||
|
@ -72,266 +55,10 @@ func runBuild(dockerCli command.Cli, in buildOptions) error {
|
||||||
end(err)
|
end(err)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
_, err = runBuildWithContext(ctx, dockerCli, in.BuildOptions, os.Stdin, in.progress, nil)
|
_, err = cbuild.RunBuild(ctx, dockerCli, in.BuildOptions, os.Stdin, in.progress, nil)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func runBuildWithContext(ctx context.Context, dockerCli command.Cli, in controllerapi.BuildOptions, inStream io.Reader, progressMode string, statusChan chan *client.SolveStatus) (res *build.ResultContext, err error) {
|
|
||||||
if in.Opts.NoCache && len(in.NoCacheFilter) > 0 {
|
|
||||||
return nil, errors.Errorf("--no-cache and --no-cache-filter cannot currently be used together")
|
|
||||||
}
|
|
||||||
|
|
||||||
if in.Quiet && progressMode != progress.PrinterModeAuto && progressMode != progress.PrinterModeQuiet {
|
|
||||||
return nil, errors.Errorf("progress=%s and quiet cannot be used together", progressMode)
|
|
||||||
} else if in.Quiet {
|
|
||||||
progressMode = "quiet"
|
|
||||||
}
|
|
||||||
|
|
||||||
contexts, err := parseContextNames(in.Contexts)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
printFunc, err := parsePrintFunc(in.PrintFunc)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
opts := build.Options{
|
|
||||||
Inputs: build.Inputs{
|
|
||||||
ContextPath: in.ContextPath,
|
|
||||||
DockerfilePath: in.DockerfileName,
|
|
||||||
InStream: inStream,
|
|
||||||
NamedContexts: contexts,
|
|
||||||
},
|
|
||||||
BuildArgs: listToMap(in.BuildArgs, true),
|
|
||||||
ExtraHosts: in.ExtraHosts,
|
|
||||||
ImageIDFile: in.ImageIDFile,
|
|
||||||
Labels: listToMap(in.Labels, false),
|
|
||||||
NetworkMode: in.NetworkMode,
|
|
||||||
NoCache: in.Opts.NoCache,
|
|
||||||
NoCacheFilter: in.NoCacheFilter,
|
|
||||||
Pull: in.Opts.Pull,
|
|
||||||
ShmSize: dockeropts.MemBytes(in.ShmSize),
|
|
||||||
Tags: in.Tags,
|
|
||||||
Target: in.Target,
|
|
||||||
Ulimits: controllerUlimitOpt2DockerUlimit(in.Ulimits),
|
|
||||||
PrintFunc: printFunc,
|
|
||||||
}
|
|
||||||
|
|
||||||
platforms, err := platformutil.Parse(in.Platforms)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
opts.Platforms = platforms
|
|
||||||
|
|
||||||
dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
|
|
||||||
opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider(dockerConfig))
|
|
||||||
|
|
||||||
secrets, err := buildflags.ParseSecretSpecs(in.Secrets)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
opts.Session = append(opts.Session, secrets)
|
|
||||||
|
|
||||||
sshSpecs := in.SSH
|
|
||||||
if len(sshSpecs) == 0 && buildflags.IsGitSSH(in.ContextPath) {
|
|
||||||
sshSpecs = []string{"default"}
|
|
||||||
}
|
|
||||||
ssh, err := buildflags.ParseSSHSpecs(sshSpecs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
opts.Session = append(opts.Session, ssh)
|
|
||||||
|
|
||||||
outputs, err := buildflags.ParseOutputs(in.Outputs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if in.Opts.ExportPush {
|
|
||||||
if in.Opts.ExportLoad {
|
|
||||||
return nil, errors.Errorf("push and load may not be set together at the moment")
|
|
||||||
}
|
|
||||||
if len(outputs) == 0 {
|
|
||||||
outputs = []client.ExportEntry{{
|
|
||||||
Type: "image",
|
|
||||||
Attrs: map[string]string{
|
|
||||||
"push": "true",
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
} else {
|
|
||||||
switch outputs[0].Type {
|
|
||||||
case "image":
|
|
||||||
outputs[0].Attrs["push"] = "true"
|
|
||||||
default:
|
|
||||||
return nil, errors.Errorf("push and %q output can't be used together", outputs[0].Type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if in.Opts.ExportLoad {
|
|
||||||
if len(outputs) == 0 {
|
|
||||||
outputs = []client.ExportEntry{{
|
|
||||||
Type: "docker",
|
|
||||||
Attrs: map[string]string{},
|
|
||||||
}}
|
|
||||||
} else {
|
|
||||||
switch outputs[0].Type {
|
|
||||||
case "docker":
|
|
||||||
default:
|
|
||||||
return nil, errors.Errorf("load and %q output can't be used together", outputs[0].Type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
opts.Exports = outputs
|
|
||||||
|
|
||||||
inAttests := append([]string{}, in.Attests...)
|
|
||||||
if in.Opts.Provenance != "" {
|
|
||||||
inAttests = append(inAttests, buildflags.CanonicalizeAttest("provenance", in.Opts.Provenance))
|
|
||||||
}
|
|
||||||
if in.Opts.SBOM != "" {
|
|
||||||
inAttests = append(inAttests, buildflags.CanonicalizeAttest("sbom", in.Opts.SBOM))
|
|
||||||
}
|
|
||||||
opts.Attests, err = buildflags.ParseAttests(inAttests)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
cacheImports, err := buildflags.ParseCacheEntry(in.CacheFrom)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
opts.CacheFrom = cacheImports
|
|
||||||
|
|
||||||
cacheExports, err := buildflags.ParseCacheEntry(in.CacheTo)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
opts.CacheTo = cacheExports
|
|
||||||
|
|
||||||
allow, err := buildflags.ParseEntitlements(in.Allow)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
opts.Allow = allow
|
|
||||||
|
|
||||||
// key string used for kubernetes "sticky" mode
|
|
||||||
contextPathHash, err := filepath.Abs(in.ContextPath)
|
|
||||||
if err != nil {
|
|
||||||
contextPathHash = in.ContextPath
|
|
||||||
}
|
|
||||||
|
|
||||||
b, err := builder.New(dockerCli,
|
|
||||||
builder.WithName(in.Opts.Builder),
|
|
||||||
builder.WithContextPathHash(contextPathHash),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "failed to update builder last activity time")
|
|
||||||
}
|
|
||||||
nodes, err := b.LoadNodes(ctx, false)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
imageID, res, err := buildTargets(ctx, dockerCli, nodes, map[string]build.Options{defaultTargetName: opts}, progressMode, in.Opts.MetadataFile, statusChan)
|
|
||||||
err = wrapBuildError(err, false)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if in.Quiet {
|
|
||||||
fmt.Println(imageID)
|
|
||||||
}
|
|
||||||
return res, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.Node, opts map[string]build.Options, progressMode string, metadataFile string, statusChan chan *client.SolveStatus) (imageID string, res *build.ResultContext, err error) {
|
|
||||||
ctx2, cancel := context.WithCancel(context.TODO())
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode)
|
|
||||||
if err != nil {
|
|
||||||
return "", nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var mu sync.Mutex
|
|
||||||
var idx int
|
|
||||||
resp, err := build.BuildWithResultHandler(ctx, nodes, opts, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), progress.Tee(printer, statusChan), func(driverIndex int, gotRes *build.ResultContext) {
|
|
||||||
mu.Lock()
|
|
||||||
defer mu.Unlock()
|
|
||||||
if res == nil || driverIndex < idx {
|
|
||||||
idx, res = driverIndex, gotRes
|
|
||||||
}
|
|
||||||
})
|
|
||||||
err1 := printer.Wait()
|
|
||||||
if err == nil {
|
|
||||||
err = err1
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return "", nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(metadataFile) > 0 && resp != nil {
|
|
||||||
if err := writeMetadataFile(metadataFile, decodeExporterResponse(resp[defaultTargetName].ExporterResponse)); err != nil {
|
|
||||||
return "", nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
printWarnings(os.Stderr, printer.Warnings(), progressMode)
|
|
||||||
|
|
||||||
for k := range resp {
|
|
||||||
if opts[k].PrintFunc != nil {
|
|
||||||
if err := printResult(opts[k].PrintFunc, resp[k].ExporterResponse); err != nil {
|
|
||||||
return "", nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return resp[defaultTargetName].ExporterResponse["containerimage.digest"], res, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func printWarnings(w io.Writer, warnings []client.VertexWarning, mode string) {
|
|
||||||
if len(warnings) == 0 || mode == progress.PrinterModeQuiet {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
fmt.Fprintf(w, "\n ")
|
|
||||||
sb := &bytes.Buffer{}
|
|
||||||
if len(warnings) == 1 {
|
|
||||||
fmt.Fprintf(sb, "1 warning found")
|
|
||||||
} else {
|
|
||||||
fmt.Fprintf(sb, "%d warnings found", len(warnings))
|
|
||||||
}
|
|
||||||
if logrus.GetLevel() < logrus.DebugLevel {
|
|
||||||
fmt.Fprintf(sb, " (use --debug to expand)")
|
|
||||||
}
|
|
||||||
fmt.Fprintf(sb, ":\n")
|
|
||||||
fmt.Fprint(w, aec.Apply(sb.String(), aec.YellowF))
|
|
||||||
|
|
||||||
for _, warn := range warnings {
|
|
||||||
fmt.Fprintf(w, " - %s\n", warn.Short)
|
|
||||||
if logrus.GetLevel() < logrus.DebugLevel {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
for _, d := range warn.Detail {
|
|
||||||
fmt.Fprintf(w, "%s\n", d)
|
|
||||||
}
|
|
||||||
if warn.URL != "" {
|
|
||||||
fmt.Fprintf(w, "More info: %s\n", warn.URL)
|
|
||||||
}
|
|
||||||
if warn.SourceInfo != nil && warn.Range != nil {
|
|
||||||
src := errdefs.Source{
|
|
||||||
Info: warn.SourceInfo,
|
|
||||||
Ranges: warn.Range,
|
|
||||||
}
|
|
||||||
src.Print(w)
|
|
||||||
}
|
|
||||||
fmt.Fprintf(w, "\n")
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
||||||
options := newBuildOptions()
|
options := newBuildOptions()
|
||||||
cFlags := &commonFlags{}
|
cFlags := &commonFlags{}
|
||||||
|
@ -430,9 +157,9 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
||||||
|
|
||||||
if isExperimental() {
|
if isExperimental() {
|
||||||
flags.StringVar(&options.invoke, "invoke", "", "Invoke a command after the build [experimental]")
|
flags.StringVar(&options.invoke, "invoke", "", "Invoke a command after the build [experimental]")
|
||||||
flags.StringVar(&options.root, "root", "", "Specify root directory of server to connect [experimental]")
|
flags.StringVar(&options.Root, "root", "", "Specify root directory of server to connect [experimental]")
|
||||||
flags.BoolVar(&options.detach, "detach", runtime.GOOS == "linux", "Detach buildx server (supported only on linux) [experimental]")
|
flags.BoolVar(&options.Detach, "detach", runtime.GOOS == "linux", "Detach buildx server (supported only on linux) [experimental]")
|
||||||
flags.StringVar(&options.serverConfig, "server-config", "", "Specify buildx server config file (used only when launching new server) [experimental]")
|
flags.StringVar(&options.ServerConfig, "server-config", "", "Specify buildx server config file (used only when launching new server) [experimental]")
|
||||||
}
|
}
|
||||||
|
|
||||||
// hidden flags
|
// hidden flags
|
||||||
|
@ -514,74 +241,6 @@ func checkWarnedFlags(f *pflag.Flag) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func listToMap(values []string, defaultEnv bool) map[string]string {
|
|
||||||
result := make(map[string]string, len(values))
|
|
||||||
for _, value := range values {
|
|
||||||
kv := strings.SplitN(value, "=", 2)
|
|
||||||
if len(kv) == 1 {
|
|
||||||
if defaultEnv {
|
|
||||||
v, ok := os.LookupEnv(kv[0])
|
|
||||||
if ok {
|
|
||||||
result[kv[0]] = v
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result[kv[0]] = ""
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result[kv[0]] = kv[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseContextNames(values []string) (map[string]build.NamedContext, error) {
|
|
||||||
if len(values) == 0 {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
result := make(map[string]build.NamedContext, len(values))
|
|
||||||
for _, value := range values {
|
|
||||||
kv := strings.SplitN(value, "=", 2)
|
|
||||||
if len(kv) != 2 {
|
|
||||||
return nil, errors.Errorf("invalid context value: %s, expected key=value", value)
|
|
||||||
}
|
|
||||||
named, err := reference.ParseNormalizedNamed(kv[0])
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "invalid context name %s", kv[0])
|
|
||||||
}
|
|
||||||
name := strings.TrimSuffix(reference.FamiliarString(named), ":latest")
|
|
||||||
result[name] = build.NamedContext{Path: kv[1]}
|
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func parsePrintFunc(str string) (*build.PrintFunc, error) {
|
|
||||||
if str == "" {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
csvReader := csv.NewReader(strings.NewReader(str))
|
|
||||||
fields, err := csvReader.Read()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
f := &build.PrintFunc{}
|
|
||||||
for _, field := range fields {
|
|
||||||
parts := strings.SplitN(field, "=", 2)
|
|
||||||
if len(parts) == 2 {
|
|
||||||
if parts[0] == "format" {
|
|
||||||
f.Format = parts[1]
|
|
||||||
} else {
|
|
||||||
return nil, errors.Errorf("invalid print field: %s", field)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if f.Name != "" {
|
|
||||||
return nil, errors.Errorf("invalid print value: %s", str)
|
|
||||||
}
|
|
||||||
f.Name = field
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return f, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeMetadataFile(filename string, dt interface{}) error {
|
func writeMetadataFile(filename string, dt interface{}) error {
|
||||||
b, err := json.MarshalIndent(dt, "", " ")
|
b, err := json.MarshalIndent(dt, "", " ")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -675,20 +334,11 @@ func launchControllerAndRunBuild(dockerCli command.Cli, options buildOptions) er
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var c monitor.BuildxController
|
c, err := controller.NewController(ctx, options.ControlOptions, dockerCli)
|
||||||
var err error
|
if err != nil {
|
||||||
if options.detach {
|
return err
|
||||||
logrus.Infof("connecting to buildx server")
|
|
||||||
c, err = newRemoteBuildxController(ctx, dockerCli, options)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to use buildx server; use --detach=false: %w", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logrus.Infof("launching local buildx controller")
|
|
||||||
c = newLocalBuildxController(ctx, dockerCli)
|
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := c.Close(); err != nil {
|
if err := c.Close(); err != nil {
|
||||||
|
@ -800,21 +450,6 @@ func parseInvokeConfig(invoke string) (cfg controllerapi.ContainerConfig, err er
|
||||||
return cfg, nil
|
return cfg, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func controllerUlimitOpt2DockerUlimit(u *controllerapi.UlimitOpt) *dockeropts.UlimitOpt {
|
|
||||||
if u == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
values := make(map[string]*units.Ulimit)
|
|
||||||
for k, v := range u.Values {
|
|
||||||
values[k] = &units.Ulimit{
|
|
||||||
Name: v.Name,
|
|
||||||
Hard: v.Hard,
|
|
||||||
Soft: v.Soft,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dockeropts.NewUlimitOpt(&values)
|
|
||||||
}
|
|
||||||
|
|
||||||
func newBuildOptions() buildOptions {
|
func newBuildOptions() buildOptions {
|
||||||
return buildOptions{
|
return buildOptions{
|
||||||
BuildOptions: controllerapi.BuildOptions{
|
BuildOptions: controllerapi.BuildOptions{
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
package pb
|
|
||||||
|
|
||||||
//go:generate protoc -I=. -I=../../../vendor/ --gogo_out=plugins=grpc:. controller.proto
|
|
|
@ -1,18 +0,0 @@
|
||||||
//go:build !linux
|
|
||||||
|
|
||||||
package commands
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/monitor"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
func newRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts buildOptions) (monitor.BuildxController, error) {
|
|
||||||
return nil, fmt.Errorf("remote buildx unsupported")
|
|
||||||
}
|
|
||||||
|
|
||||||
func addControllerCommands(cmd *cobra.Command, dockerCli command.Cli, rootOpts *rootOptions) {}
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
imagetoolscmd "github.com/docker/buildx/commands/imagetools"
|
imagetoolscmd "github.com/docker/buildx/commands/imagetools"
|
||||||
|
"github.com/docker/buildx/controller/remote"
|
||||||
"github.com/docker/buildx/util/logutil"
|
"github.com/docker/buildx/util/logutil"
|
||||||
"github.com/docker/cli-docs-tool/annotation"
|
"github.com/docker/cli-docs-tool/annotation"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
|
@ -87,7 +88,7 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
|
||||||
imagetoolscmd.RootCmd(dockerCli, imagetoolscmd.RootOptions{Builder: &opts.builder}),
|
imagetoolscmd.RootCmd(dockerCli, imagetoolscmd.RootOptions{Builder: &opts.builder}),
|
||||||
)
|
)
|
||||||
if isExperimental() {
|
if isExperimental() {
|
||||||
addControllerCommands(cmd, dockerCli, opts)
|
remote.AddControllerCommands(cmd, dockerCli)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,447 @@
|
||||||
|
package build
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/csv"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/docker/buildx/build"
|
||||||
|
"github.com/docker/buildx/builder"
|
||||||
|
controllerapi "github.com/docker/buildx/controller/pb"
|
||||||
|
"github.com/docker/buildx/store"
|
||||||
|
"github.com/docker/buildx/store/storeutil"
|
||||||
|
"github.com/docker/buildx/util/buildflags"
|
||||||
|
"github.com/docker/buildx/util/confutil"
|
||||||
|
"github.com/docker/buildx/util/dockerutil"
|
||||||
|
"github.com/docker/buildx/util/platformutil"
|
||||||
|
"github.com/docker/buildx/util/progress"
|
||||||
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/docker/cli/cli/config"
|
||||||
|
dockeropts "github.com/docker/cli/opts"
|
||||||
|
"github.com/docker/distribution/reference"
|
||||||
|
"github.com/docker/docker/pkg/ioutils"
|
||||||
|
"github.com/docker/go-units"
|
||||||
|
"github.com/moby/buildkit/client"
|
||||||
|
"github.com/moby/buildkit/session/auth/authprovider"
|
||||||
|
"github.com/moby/buildkit/solver/errdefs"
|
||||||
|
"github.com/moby/buildkit/util/grpcerrors"
|
||||||
|
"github.com/morikuni/aec"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"google.golang.org/grpc/codes"
|
||||||
|
)
|
||||||
|
|
||||||
|
const defaultTargetName = "default"
|
||||||
|
|
||||||
|
func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.BuildOptions, inStream io.Reader, progressMode string, statusChan chan *client.SolveStatus) (res *build.ResultContext, err error) {
|
||||||
|
if in.Opts.NoCache && len(in.NoCacheFilter) > 0 {
|
||||||
|
return nil, errors.Errorf("--no-cache and --no-cache-filter cannot currently be used together")
|
||||||
|
}
|
||||||
|
|
||||||
|
if in.Quiet && progressMode != progress.PrinterModeAuto && progressMode != progress.PrinterModeQuiet {
|
||||||
|
return nil, errors.Errorf("progress=%s and quiet cannot be used together", progressMode)
|
||||||
|
} else if in.Quiet {
|
||||||
|
progressMode = "quiet"
|
||||||
|
}
|
||||||
|
|
||||||
|
contexts, err := parseContextNames(in.Contexts)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
printFunc, err := parsePrintFunc(in.PrintFunc)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := build.Options{
|
||||||
|
Inputs: build.Inputs{
|
||||||
|
ContextPath: in.ContextPath,
|
||||||
|
DockerfilePath: in.DockerfileName,
|
||||||
|
InStream: inStream,
|
||||||
|
NamedContexts: contexts,
|
||||||
|
},
|
||||||
|
BuildArgs: listToMap(in.BuildArgs, true),
|
||||||
|
ExtraHosts: in.ExtraHosts,
|
||||||
|
ImageIDFile: in.ImageIDFile,
|
||||||
|
Labels: listToMap(in.Labels, false),
|
||||||
|
NetworkMode: in.NetworkMode,
|
||||||
|
NoCache: in.Opts.NoCache,
|
||||||
|
NoCacheFilter: in.NoCacheFilter,
|
||||||
|
Pull: in.Opts.Pull,
|
||||||
|
ShmSize: dockeropts.MemBytes(in.ShmSize),
|
||||||
|
Tags: in.Tags,
|
||||||
|
Target: in.Target,
|
||||||
|
Ulimits: controllerUlimitOpt2DockerUlimit(in.Ulimits),
|
||||||
|
PrintFunc: printFunc,
|
||||||
|
}
|
||||||
|
|
||||||
|
platforms, err := platformutil.Parse(in.Platforms)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
opts.Platforms = platforms
|
||||||
|
|
||||||
|
dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
|
||||||
|
opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider(dockerConfig))
|
||||||
|
|
||||||
|
secrets, err := buildflags.ParseSecretSpecs(in.Secrets)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
opts.Session = append(opts.Session, secrets)
|
||||||
|
|
||||||
|
sshSpecs := in.SSH
|
||||||
|
if len(sshSpecs) == 0 && buildflags.IsGitSSH(in.ContextPath) {
|
||||||
|
sshSpecs = []string{"default"}
|
||||||
|
}
|
||||||
|
ssh, err := buildflags.ParseSSHSpecs(sshSpecs)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
opts.Session = append(opts.Session, ssh)
|
||||||
|
|
||||||
|
outputs, err := buildflags.ParseOutputs(in.Outputs)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if in.Opts.ExportPush {
|
||||||
|
if in.Opts.ExportLoad {
|
||||||
|
return nil, errors.Errorf("push and load may not be set together at the moment")
|
||||||
|
}
|
||||||
|
if len(outputs) == 0 {
|
||||||
|
outputs = []client.ExportEntry{{
|
||||||
|
Type: "image",
|
||||||
|
Attrs: map[string]string{
|
||||||
|
"push": "true",
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
} else {
|
||||||
|
switch outputs[0].Type {
|
||||||
|
case "image":
|
||||||
|
outputs[0].Attrs["push"] = "true"
|
||||||
|
default:
|
||||||
|
return nil, errors.Errorf("push and %q output can't be used together", outputs[0].Type)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if in.Opts.ExportLoad {
|
||||||
|
if len(outputs) == 0 {
|
||||||
|
outputs = []client.ExportEntry{{
|
||||||
|
Type: "docker",
|
||||||
|
Attrs: map[string]string{},
|
||||||
|
}}
|
||||||
|
} else {
|
||||||
|
switch outputs[0].Type {
|
||||||
|
case "docker":
|
||||||
|
default:
|
||||||
|
return nil, errors.Errorf("load and %q output can't be used together", outputs[0].Type)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
opts.Exports = outputs
|
||||||
|
|
||||||
|
inAttests := append([]string{}, in.Attests...)
|
||||||
|
if in.Opts.Provenance != "" {
|
||||||
|
inAttests = append(inAttests, buildflags.CanonicalizeAttest("provenance", in.Opts.Provenance))
|
||||||
|
}
|
||||||
|
if in.Opts.SBOM != "" {
|
||||||
|
inAttests = append(inAttests, buildflags.CanonicalizeAttest("sbom", in.Opts.SBOM))
|
||||||
|
}
|
||||||
|
opts.Attests, err = buildflags.ParseAttests(inAttests)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
cacheImports, err := buildflags.ParseCacheEntry(in.CacheFrom)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
opts.CacheFrom = cacheImports
|
||||||
|
|
||||||
|
cacheExports, err := buildflags.ParseCacheEntry(in.CacheTo)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
opts.CacheTo = cacheExports
|
||||||
|
|
||||||
|
allow, err := buildflags.ParseEntitlements(in.Allow)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
opts.Allow = allow
|
||||||
|
|
||||||
|
// key string used for kubernetes "sticky" mode
|
||||||
|
contextPathHash, err := filepath.Abs(in.ContextPath)
|
||||||
|
if err != nil {
|
||||||
|
contextPathHash = in.ContextPath
|
||||||
|
}
|
||||||
|
|
||||||
|
b, err := builder.New(dockerCli,
|
||||||
|
builder.WithName(in.Opts.Builder),
|
||||||
|
builder.WithContextPathHash(contextPathHash),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
|
||||||
|
return nil, errors.Wrapf(err, "failed to update builder last activity time")
|
||||||
|
}
|
||||||
|
nodes, err := b.LoadNodes(ctx, false)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
imageID, res, err := buildTargets(ctx, dockerCli, nodes, map[string]build.Options{defaultTargetName: opts}, progressMode, in.Opts.MetadataFile, statusChan)
|
||||||
|
err = wrapBuildError(err, false)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if in.Quiet {
|
||||||
|
fmt.Println(imageID)
|
||||||
|
}
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.Node, opts map[string]build.Options, progressMode string, metadataFile string, statusChan chan *client.SolveStatus) (imageID string, res *build.ResultContext, err error) {
|
||||||
|
ctx2, cancel := context.WithCancel(context.TODO())
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var mu sync.Mutex
|
||||||
|
var idx int
|
||||||
|
resp, err := build.BuildWithResultHandler(ctx, nodes, opts, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), progress.Tee(printer, statusChan), func(driverIndex int, gotRes *build.ResultContext) {
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
if res == nil || driverIndex < idx {
|
||||||
|
idx, res = driverIndex, gotRes
|
||||||
|
}
|
||||||
|
})
|
||||||
|
err1 := printer.Wait()
|
||||||
|
if err == nil {
|
||||||
|
err = err1
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(metadataFile) > 0 && resp != nil {
|
||||||
|
if err := writeMetadataFile(metadataFile, decodeExporterResponse(resp[defaultTargetName].ExporterResponse)); err != nil {
|
||||||
|
return "", nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
printWarnings(os.Stderr, printer.Warnings(), progressMode)
|
||||||
|
|
||||||
|
for k := range resp {
|
||||||
|
if opts[k].PrintFunc != nil {
|
||||||
|
if err := printResult(opts[k].PrintFunc, resp[k].ExporterResponse); err != nil {
|
||||||
|
return "", nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp[defaultTargetName].ExporterResponse["containerimage.digest"], res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func printWarnings(w io.Writer, warnings []client.VertexWarning, mode string) {
|
||||||
|
if len(warnings) == 0 || mode == progress.PrinterModeQuiet {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprintf(w, "\n ")
|
||||||
|
sb := &bytes.Buffer{}
|
||||||
|
if len(warnings) == 1 {
|
||||||
|
fmt.Fprintf(sb, "1 warning found")
|
||||||
|
} else {
|
||||||
|
fmt.Fprintf(sb, "%d warnings found", len(warnings))
|
||||||
|
}
|
||||||
|
if logrus.GetLevel() < logrus.DebugLevel {
|
||||||
|
fmt.Fprintf(sb, " (use --debug to expand)")
|
||||||
|
}
|
||||||
|
fmt.Fprintf(sb, ":\n")
|
||||||
|
fmt.Fprint(w, aec.Apply(sb.String(), aec.YellowF))
|
||||||
|
|
||||||
|
for _, warn := range warnings {
|
||||||
|
fmt.Fprintf(w, " - %s\n", warn.Short)
|
||||||
|
if logrus.GetLevel() < logrus.DebugLevel {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, d := range warn.Detail {
|
||||||
|
fmt.Fprintf(w, "%s\n", d)
|
||||||
|
}
|
||||||
|
if warn.URL != "" {
|
||||||
|
fmt.Fprintf(w, "More info: %s\n", warn.URL)
|
||||||
|
}
|
||||||
|
if warn.SourceInfo != nil && warn.Range != nil {
|
||||||
|
src := errdefs.Source{
|
||||||
|
Info: warn.SourceInfo,
|
||||||
|
Ranges: warn.Range,
|
||||||
|
}
|
||||||
|
src.Print(w)
|
||||||
|
}
|
||||||
|
fmt.Fprintf(w, "\n")
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func listToMap(values []string, defaultEnv bool) map[string]string {
|
||||||
|
result := make(map[string]string, len(values))
|
||||||
|
for _, value := range values {
|
||||||
|
kv := strings.SplitN(value, "=", 2)
|
||||||
|
if len(kv) == 1 {
|
||||||
|
if defaultEnv {
|
||||||
|
v, ok := os.LookupEnv(kv[0])
|
||||||
|
if ok {
|
||||||
|
result[kv[0]] = v
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
result[kv[0]] = ""
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
result[kv[0]] = kv[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseContextNames(values []string) (map[string]build.NamedContext, error) {
|
||||||
|
if len(values) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
result := make(map[string]build.NamedContext, len(values))
|
||||||
|
for _, value := range values {
|
||||||
|
kv := strings.SplitN(value, "=", 2)
|
||||||
|
if len(kv) != 2 {
|
||||||
|
return nil, errors.Errorf("invalid context value: %s, expected key=value", value)
|
||||||
|
}
|
||||||
|
named, err := reference.ParseNormalizedNamed(kv[0])
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.Wrapf(err, "invalid context name %s", kv[0])
|
||||||
|
}
|
||||||
|
name := strings.TrimSuffix(reference.FamiliarString(named), ":latest")
|
||||||
|
result[name] = build.NamedContext{Path: kv[1]}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parsePrintFunc(str string) (*build.PrintFunc, error) {
|
||||||
|
if str == "" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
csvReader := csv.NewReader(strings.NewReader(str))
|
||||||
|
fields, err := csvReader.Read()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
f := &build.PrintFunc{}
|
||||||
|
for _, field := range fields {
|
||||||
|
parts := strings.SplitN(field, "=", 2)
|
||||||
|
if len(parts) == 2 {
|
||||||
|
if parts[0] == "format" {
|
||||||
|
f.Format = parts[1]
|
||||||
|
} else {
|
||||||
|
return nil, errors.Errorf("invalid print field: %s", field)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if f.Name != "" {
|
||||||
|
return nil, errors.Errorf("invalid print value: %s", str)
|
||||||
|
}
|
||||||
|
f.Name = field
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return f, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeMetadataFile(filename string, dt interface{}) error {
|
||||||
|
b, err := json.MarshalIndent(dt, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return ioutils.AtomicWriteFile(filename, b, 0644)
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeExporterResponse(exporterResponse map[string]string) map[string]interface{} {
|
||||||
|
out := make(map[string]interface{})
|
||||||
|
for k, v := range exporterResponse {
|
||||||
|
dt, err := base64.StdEncoding.DecodeString(v)
|
||||||
|
if err != nil {
|
||||||
|
out[k] = v
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var raw map[string]interface{}
|
||||||
|
if err = json.Unmarshal(dt, &raw); err != nil || len(raw) == 0 {
|
||||||
|
out[k] = v
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out[k] = json.RawMessage(dt)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func wrapBuildError(err error, bake bool) error {
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
st, ok := grpcerrors.AsGRPCStatus(err)
|
||||||
|
if ok {
|
||||||
|
if st.Code() == codes.Unimplemented && strings.Contains(st.Message(), "unsupported frontend capability moby.buildkit.frontend.contexts") {
|
||||||
|
msg := "current frontend does not support --build-context."
|
||||||
|
if bake {
|
||||||
|
msg = "current frontend does not support defining additional contexts for targets."
|
||||||
|
}
|
||||||
|
msg += " Named contexts are supported since Dockerfile v1.4. Use #syntax directive in Dockerfile or update to latest BuildKit."
|
||||||
|
return &wrapped{err, msg}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
type wrapped struct {
|
||||||
|
err error
|
||||||
|
msg string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *wrapped) Error() string {
|
||||||
|
return w.msg
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *wrapped) Unwrap() error {
|
||||||
|
return w.err
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateLastActivity(dockerCli command.Cli, ng *store.NodeGroup) error {
|
||||||
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer release()
|
||||||
|
return txn.UpdateLastActivity(ng)
|
||||||
|
}
|
||||||
|
|
||||||
|
func controllerUlimitOpt2DockerUlimit(u *controllerapi.UlimitOpt) *dockeropts.UlimitOpt {
|
||||||
|
if u == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
values := make(map[string]*units.Ulimit)
|
||||||
|
for k, v := range u.Values {
|
||||||
|
values[k] = &units.Ulimit{
|
||||||
|
Name: v.Name,
|
||||||
|
Hard: v.Hard,
|
||||||
|
Soft: v.Soft,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dockeropts.NewUlimitOpt(&values)
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package commands
|
package build
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
|
@ -0,0 +1,24 @@
|
||||||
|
package control
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
|
||||||
|
"github.com/containerd/console"
|
||||||
|
controllerapi "github.com/docker/buildx/controller/pb"
|
||||||
|
)
|
||||||
|
|
||||||
|
type BuildxController interface {
|
||||||
|
Invoke(ctx context.Context, ref string, options controllerapi.ContainerConfig, ioIn io.ReadCloser, ioOut io.WriteCloser, ioErr io.WriteCloser) error
|
||||||
|
Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, w io.Writer, out console.File, progressMode string) (ref string, err error)
|
||||||
|
Kill(ctx context.Context) error
|
||||||
|
Close() error
|
||||||
|
List(ctx context.Context) (res []string, _ error)
|
||||||
|
Disconnect(ctx context.Context, ref string) error
|
||||||
|
}
|
||||||
|
|
||||||
|
type ControlOptions struct {
|
||||||
|
ServerConfig string
|
||||||
|
Root string
|
||||||
|
Detach bool
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
package controller
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/docker/buildx/controller/control"
|
||||||
|
"github.com/docker/buildx/controller/local"
|
||||||
|
"github.com/docker/buildx/controller/remote"
|
||||||
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewController(ctx context.Context, opts control.ControlOptions, dockerCli command.Cli) (c control.BuildxController, err error) {
|
||||||
|
if !opts.Detach {
|
||||||
|
logrus.Infof("launching local buildx controller")
|
||||||
|
c = local.NewLocalBuildxController(ctx, dockerCli)
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("connecting to buildx server")
|
||||||
|
c, err = remote.NewRemoteBuildxController(ctx, dockerCli, opts)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to use buildx server; use --detach=false: %w", err)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package commands
|
package local
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
@ -7,12 +7,13 @@ import (
|
||||||
|
|
||||||
"github.com/containerd/console"
|
"github.com/containerd/console"
|
||||||
"github.com/docker/buildx/build"
|
"github.com/docker/buildx/build"
|
||||||
controllerapi "github.com/docker/buildx/commands/controller/pb"
|
cbuild "github.com/docker/buildx/controller/build"
|
||||||
"github.com/docker/buildx/monitor"
|
"github.com/docker/buildx/controller/control"
|
||||||
|
controllerapi "github.com/docker/buildx/controller/pb"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newLocalBuildxController(ctx context.Context, dockerCli command.Cli) monitor.BuildxController {
|
func NewLocalBuildxController(ctx context.Context, dockerCli command.Cli) control.BuildxController {
|
||||||
return &localController{
|
return &localController{
|
||||||
dockerCli: dockerCli,
|
dockerCli: dockerCli,
|
||||||
ref: "local",
|
ref: "local",
|
||||||
|
@ -52,7 +53,7 @@ func (b *localController) Invoke(ctx context.Context, ref string, cfg controller
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *localController) Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, w io.Writer, out console.File, progressMode string) (string, error) {
|
func (b *localController) Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, w io.Writer, out console.File, progressMode string) (string, error) {
|
||||||
res, err := runBuildWithContext(ctx, b.dockerCli, options, in, progressMode, nil)
|
res, err := cbuild.RunBuild(ctx, b.dockerCli, options, in, progressMode, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
package pb
|
||||||
|
|
||||||
|
//go:generate protoc -I=. -I=../../vendor/ --gogo_out=plugins=grpc:. controller.proto
|
|
@ -1,4 +1,4 @@
|
||||||
package controller
|
package remote
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
@ -10,7 +10,7 @@ import (
|
||||||
"github.com/containerd/console"
|
"github.com/containerd/console"
|
||||||
"github.com/containerd/containerd/defaults"
|
"github.com/containerd/containerd/defaults"
|
||||||
"github.com/containerd/containerd/pkg/dialer"
|
"github.com/containerd/containerd/pkg/dialer"
|
||||||
"github.com/docker/buildx/commands/controller/pb"
|
"github.com/docker/buildx/controller/pb"
|
||||||
"github.com/docker/buildx/util/progress"
|
"github.com/docker/buildx/util/progress"
|
||||||
"github.com/moby/buildkit/client"
|
"github.com/moby/buildkit/client"
|
||||||
"github.com/moby/buildkit/identity"
|
"github.com/moby/buildkit/identity"
|
|
@ -1,6 +1,6 @@
|
||||||
//go:build linux
|
//go:build linux
|
||||||
|
|
||||||
package commands
|
package remote
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
@ -17,9 +17,9 @@ import (
|
||||||
|
|
||||||
"github.com/containerd/containerd/log"
|
"github.com/containerd/containerd/log"
|
||||||
"github.com/docker/buildx/build"
|
"github.com/docker/buildx/build"
|
||||||
"github.com/docker/buildx/commands/controller"
|
cbuild "github.com/docker/buildx/controller/build"
|
||||||
controllerapi "github.com/docker/buildx/commands/controller/pb"
|
"github.com/docker/buildx/controller/control"
|
||||||
"github.com/docker/buildx/monitor"
|
controllerapi "github.com/docker/buildx/controller/pb"
|
||||||
"github.com/docker/buildx/util/confutil"
|
"github.com/docker/buildx/util/confutil"
|
||||||
"github.com/docker/buildx/version"
|
"github.com/docker/buildx/version"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
|
@ -45,8 +45,8 @@ type serverConfig struct {
|
||||||
LogFile string `toml:"log_file"`
|
LogFile string `toml:"log_file"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func newRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts buildOptions) (monitor.BuildxController, error) {
|
func NewRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts control.ControlOptions) (control.BuildxController, error) {
|
||||||
rootDir := opts.root
|
rootDir := opts.Root
|
||||||
if rootDir == "" {
|
if rootDir == "" {
|
||||||
rootDir = rootDataDir(dockerCli)
|
rootDir = rootDataDir(dockerCli)
|
||||||
}
|
}
|
||||||
|
@ -56,10 +56,10 @@ func newRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts
|
||||||
logrus.Info("no buildx server found; launching...")
|
logrus.Info("no buildx server found; launching...")
|
||||||
// start buildx server via subcommand
|
// start buildx server via subcommand
|
||||||
launchFlags := []string{}
|
launchFlags := []string{}
|
||||||
if opts.serverConfig != "" {
|
if opts.ServerConfig != "" {
|
||||||
launchFlags = append(launchFlags, "--config", opts.serverConfig)
|
launchFlags = append(launchFlags, "--config", opts.ServerConfig)
|
||||||
}
|
}
|
||||||
logFile, err := getLogFilePath(dockerCli, opts.serverConfig)
|
logFile, err := getLogFilePath(dockerCli, opts.ServerConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -76,13 +76,13 @@ func newRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts
|
||||||
return &buildxController{c, serverRoot}, nil
|
return &buildxController{c, serverRoot}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func addControllerCommands(cmd *cobra.Command, dockerCli command.Cli, rootOpts *rootOptions) {
|
func AddControllerCommands(cmd *cobra.Command, dockerCli command.Cli) {
|
||||||
cmd.AddCommand(
|
cmd.AddCommand(
|
||||||
serveCmd(dockerCli, rootOpts),
|
serveCmd(dockerCli),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
func serveCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
func serveCmd(dockerCli command.Cli) *cobra.Command {
|
||||||
var serverConfigPath string
|
var serverConfigPath string
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: fmt.Sprintf("%s [OPTIONS]", serveCommandName),
|
Use: fmt.Sprintf("%s [OPTIONS]", serveCommandName),
|
||||||
|
@ -120,8 +120,8 @@ func serveCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// prepare server
|
// prepare server
|
||||||
b := controller.New(func(ctx context.Context, options *controllerapi.BuildOptions, stdin io.Reader, statusChan chan *client.SolveStatus) (res *build.ResultContext, err error) {
|
b := NewServer(func(ctx context.Context, options *controllerapi.BuildOptions, stdin io.Reader, statusChan chan *client.SolveStatus) (res *build.ResultContext, err error) {
|
||||||
return runBuildWithContext(ctx, dockerCli, *options, stdin, "quiet", statusChan)
|
return cbuild.RunBuild(ctx, dockerCli, *options, stdin, "quiet", statusChan)
|
||||||
})
|
})
|
||||||
defer b.Close()
|
defer b.Close()
|
||||||
|
|
||||||
|
@ -149,7 +149,6 @@ func serveCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
||||||
if err := rpc.Serve(l); err != nil {
|
if err := rpc.Serve(l); err != nil {
|
||||||
errCh <- fmt.Errorf("error on serving via socket %q: %w", addr, err)
|
errCh <- fmt.Errorf("error on serving via socket %q: %w", addr, err)
|
||||||
}
|
}
|
||||||
return
|
|
||||||
}()
|
}()
|
||||||
var s os.Signal
|
var s os.Signal
|
||||||
sigCh := make(chan os.Signal, 1)
|
sigCh := make(chan os.Signal, 1)
|
||||||
|
@ -228,8 +227,8 @@ func rootDataDir(dockerCli command.Cli) string {
|
||||||
return filepath.Join(confutil.ConfigDir(dockerCli), "controller")
|
return filepath.Join(confutil.ConfigDir(dockerCli), "controller")
|
||||||
}
|
}
|
||||||
|
|
||||||
func newBuildxClientAndCheck(addr string, checkNum int, duration time.Duration) (*controller.Client, error) {
|
func newBuildxClientAndCheck(addr string, checkNum int, duration time.Duration) (*Client, error) {
|
||||||
c, err := controller.NewClient(addr)
|
c, err := NewClient(addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -261,7 +260,7 @@ func newBuildxClientAndCheck(addr string, checkNum int, duration time.Duration)
|
||||||
}
|
}
|
||||||
|
|
||||||
type buildxController struct {
|
type buildxController struct {
|
||||||
*controller.Client
|
*Client
|
||||||
serverRoot string
|
serverRoot string
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
//go:build !linux
|
||||||
|
|
||||||
|
package remote
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/docker/buildx/controller/control"
|
||||||
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts control.ControlOptions) (control.BuildxController, error) {
|
||||||
|
return nil, fmt.Errorf("remote buildx unsupported")
|
||||||
|
}
|
||||||
|
|
||||||
|
func AddControllerCommands(cmd *cobra.Command, dockerCli command.Cli) {}
|
|
@ -1,4 +1,4 @@
|
||||||
package controller
|
package remote
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
@ -8,7 +8,7 @@ import (
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/commands/controller/pb"
|
"github.com/docker/buildx/controller/pb"
|
||||||
"github.com/moby/sys/signal"
|
"github.com/moby/sys/signal"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
|
@ -1,4 +1,4 @@
|
||||||
package controller
|
package remote
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
@ -9,7 +9,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/build"
|
"github.com/docker/buildx/build"
|
||||||
"github.com/docker/buildx/commands/controller/pb"
|
"github.com/docker/buildx/controller/pb"
|
||||||
"github.com/docker/buildx/util/ioset"
|
"github.com/docker/buildx/util/ioset"
|
||||||
"github.com/docker/buildx/version"
|
"github.com/docker/buildx/version"
|
||||||
controlapi "github.com/moby/buildkit/api/services/control"
|
controlapi "github.com/moby/buildkit/api/services/control"
|
||||||
|
@ -20,13 +20,13 @@ import (
|
||||||
|
|
||||||
type BuildFunc func(ctx context.Context, options *pb.BuildOptions, stdin io.Reader, statusChan chan *client.SolveStatus) (res *build.ResultContext, err error)
|
type BuildFunc func(ctx context.Context, options *pb.BuildOptions, stdin io.Reader, statusChan chan *client.SolveStatus) (res *build.ResultContext, err error)
|
||||||
|
|
||||||
func New(buildFunc BuildFunc) *Controller {
|
func NewServer(buildFunc BuildFunc) *Server {
|
||||||
return &Controller{
|
return &Server{
|
||||||
buildFunc: buildFunc,
|
buildFunc: buildFunc,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type Controller struct {
|
type Server struct {
|
||||||
buildFunc BuildFunc
|
buildFunc BuildFunc
|
||||||
session map[string]session
|
session map[string]session
|
||||||
sessionMu sync.Mutex
|
sessionMu sync.Mutex
|
||||||
|
@ -40,7 +40,7 @@ type session struct {
|
||||||
curBuildCancel func()
|
curBuildCancel func()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) Info(ctx context.Context, req *pb.InfoRequest) (res *pb.InfoResponse, err error) {
|
func (m *Server) Info(ctx context.Context, req *pb.InfoRequest) (res *pb.InfoResponse, err error) {
|
||||||
return &pb.InfoResponse{
|
return &pb.InfoResponse{
|
||||||
BuildxVersion: &pb.BuildxVersion{
|
BuildxVersion: &pb.BuildxVersion{
|
||||||
Package: version.Package,
|
Package: version.Package,
|
||||||
|
@ -50,7 +50,7 @@ func (m *Controller) Info(ctx context.Context, req *pb.InfoRequest) (res *pb.Inf
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) List(ctx context.Context, req *pb.ListRequest) (res *pb.ListResponse, err error) {
|
func (m *Server) List(ctx context.Context, req *pb.ListRequest) (res *pb.ListResponse, err error) {
|
||||||
keys := make(map[string]struct{})
|
keys := make(map[string]struct{})
|
||||||
|
|
||||||
m.sessionMu.Lock()
|
m.sessionMu.Lock()
|
||||||
|
@ -68,7 +68,7 @@ func (m *Controller) List(ctx context.Context, req *pb.ListRequest) (res *pb.Lis
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) Disconnect(ctx context.Context, req *pb.DisconnectRequest) (res *pb.DisconnectResponse, err error) {
|
func (m *Server) Disconnect(ctx context.Context, req *pb.DisconnectRequest) (res *pb.DisconnectResponse, err error) {
|
||||||
key := req.Ref
|
key := req.Ref
|
||||||
if key == "" {
|
if key == "" {
|
||||||
return nil, fmt.Errorf("disconnect: empty key")
|
return nil, fmt.Errorf("disconnect: empty key")
|
||||||
|
@ -89,7 +89,7 @@ func (m *Controller) Disconnect(ctx context.Context, req *pb.DisconnectRequest)
|
||||||
return &pb.DisconnectResponse{}, nil
|
return &pb.DisconnectResponse{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) Close() error {
|
func (m *Server) Close() error {
|
||||||
m.sessionMu.Lock()
|
m.sessionMu.Lock()
|
||||||
for k := range m.session {
|
for k := range m.session {
|
||||||
if s, ok := m.session[k]; ok {
|
if s, ok := m.session[k]; ok {
|
||||||
|
@ -105,7 +105,7 @@ func (m *Controller) Close() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) Build(ctx context.Context, req *pb.BuildRequest) (*pb.BuildResponse, error) {
|
func (m *Server) Build(ctx context.Context, req *pb.BuildRequest) (*pb.BuildResponse, error) {
|
||||||
ref := req.Ref
|
ref := req.Ref
|
||||||
if ref == "" {
|
if ref == "" {
|
||||||
return nil, fmt.Errorf("build: empty key")
|
return nil, fmt.Errorf("build: empty key")
|
||||||
|
@ -166,7 +166,7 @@ func (m *Controller) Build(ctx context.Context, req *pb.BuildRequest) (*pb.Build
|
||||||
return &pb.BuildResponse{}, err
|
return &pb.BuildResponse{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) Status(req *pb.StatusRequest, stream pb.Controller_StatusServer) error {
|
func (m *Server) Status(req *pb.StatusRequest, stream pb.Controller_StatusServer) error {
|
||||||
ref := req.Ref
|
ref := req.Ref
|
||||||
if ref == "" {
|
if ref == "" {
|
||||||
return fmt.Errorf("status: empty key")
|
return fmt.Errorf("status: empty key")
|
||||||
|
@ -201,7 +201,7 @@ func (m *Controller) Status(req *pb.StatusRequest, stream pb.Controller_StatusSe
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) Input(stream pb.Controller_InputServer) (err error) {
|
func (m *Server) Input(stream pb.Controller_InputServer) (err error) {
|
||||||
// Get the target ref from init message
|
// Get the target ref from init message
|
||||||
msg, err := stream.Recv()
|
msg, err := stream.Recv()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -293,7 +293,7 @@ func (m *Controller) Input(stream pb.Controller_InputServer) (err error) {
|
||||||
return eg.Wait()
|
return eg.Wait()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Controller) Invoke(srv pb.Controller_InvokeServer) error {
|
func (m *Server) Invoke(srv pb.Controller_InvokeServer) error {
|
||||||
ctx, cancel := context.WithCancel(context.TODO())
|
ctx, cancel := context.WithCancel(context.TODO())
|
||||||
defer cancel()
|
defer cancel()
|
||||||
containerIn, containerOut := ioset.Pipe()
|
containerIn, containerOut := ioset.Pipe()
|
|
@ -10,7 +10,8 @@ import (
|
||||||
"text/tabwriter"
|
"text/tabwriter"
|
||||||
|
|
||||||
"github.com/containerd/console"
|
"github.com/containerd/console"
|
||||||
controllerapi "github.com/docker/buildx/commands/controller/pb"
|
"github.com/docker/buildx/controller/control"
|
||||||
|
controllerapi "github.com/docker/buildx/controller/pb"
|
||||||
"github.com/docker/buildx/util/ioset"
|
"github.com/docker/buildx/util/ioset"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"golang.org/x/term"
|
"golang.org/x/term"
|
||||||
|
@ -28,17 +29,8 @@ Available commads are:
|
||||||
help shows this message.
|
help shows this message.
|
||||||
`
|
`
|
||||||
|
|
||||||
type BuildxController interface {
|
|
||||||
Invoke(ctx context.Context, ref string, options controllerapi.ContainerConfig, ioIn io.ReadCloser, ioOut io.WriteCloser, ioErr io.WriteCloser) error
|
|
||||||
Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, w io.Writer, out console.File, progressMode string) (ref string, err error)
|
|
||||||
Kill(ctx context.Context) error
|
|
||||||
Close() error
|
|
||||||
List(ctx context.Context) (res []string, _ error)
|
|
||||||
Disconnect(ctx context.Context, ref string) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// RunMonitor provides an interactive session for running and managing containers via specified IO.
|
// RunMonitor provides an interactive session for running and managing containers via specified IO.
|
||||||
func RunMonitor(ctx context.Context, curRef string, options controllerapi.BuildOptions, invokeConfig controllerapi.ContainerConfig, c BuildxController, progressMode string, stdin io.ReadCloser, stdout io.WriteCloser, stderr console.File) error {
|
func RunMonitor(ctx context.Context, curRef string, options controllerapi.BuildOptions, invokeConfig controllerapi.ContainerConfig, c control.BuildxController, progressMode string, stdin io.ReadCloser, stdout io.WriteCloser, stderr console.File) error {
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := c.Disconnect(ctx, curRef); err != nil {
|
if err := c.Disconnect(ctx, curRef); err != nil {
|
||||||
logrus.Warnf("disconnect error: %v", err)
|
logrus.Warnf("disconnect error: %v", err)
|
||||||
|
|
Loading…
Reference in New Issue