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

driver: start implemeting bootstrap for docker

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2019-03-25 19:01:31 -07:00
parent 49f67b7e96
commit f302881c0d
8 changed files with 144 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
commands/build.go
View File

@ -7,12 +7,11 @@ import (
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/moby/buildkit/client"
"github.com/moby/buildkit/session/auth/authprovider"
"github.com/moby/buildkit/util/appcontext"
bkappdefaults "github.com/moby/buildkit/util/appdefaults"
"github.com/spf13/cobra"
"github.com/tonistiigi/buildx/build"
"github.com/tonistiigi/buildx/driver"
)
type buildOptions struct {
@ -94,8 +93,7 @@ func runBuild(dockerCli command.Cli, in buildOptions) error {
}
opts.Exports = outputs
// TODO: temporary
c, err := client.New(ctx, bkappdefaults.Address, client.WithFailFast())
d, err := driver.GetDriver(ctx, "buildkit.default", nil, dockerCli.Client())
if err != nil {
return err
}
@ -104,7 +102,7 @@ func runBuild(dockerCli command.Cli, in buildOptions) error {
defer cancel()
pw := build.NewProgressWriter(ctx2, os.Stderr, in.progress)
_, err = build.Build(ctx, c, opts, pw)
_, err = build.Build(ctx, []driver.Driver{d}, opts, pw)
return err
}

4
commands/root.go
View File

@ -1,6 +1,7 @@
package commands
import (
"github.com/docker/cli/cli-plugins/plugin"
"github.com/docker/cli/cli/command"
"github.com/spf13/cobra"
)
@ -9,6 +10,9 @@ func NewRootCmd(dockerCli command.Cli) *cobra.Command {
cmd := &cobra.Command{
Short: "Build with BuildKit",
Use: "buildx",
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
return plugin.PersistentPreRunE(cmd, args)
},
}
addCommands(cmd, dockerCli)
return cmd