Skip to content

Commit

Permalink
bump buildkit to e8c26ec2a167e37fd939bdaf6c1135c132e740a9
Browse files Browse the repository at this point in the history
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
  • Loading branch information
ehazlett committed Nov 7, 2019
1 parent 0825d0a commit b91f239
Show file tree
Hide file tree
Showing 911 changed files with 106,840 additions and 57,658 deletions.
39 changes: 25 additions & 14 deletions build.go
Expand Up @@ -115,11 +115,9 @@ func build(clix *cli.Context) error {
atters["no-cache"] = ""
}
solveOpt := client.SolveOpt{
Exporter: "image",
ExporterAttrs: make(map[string]string),
Frontend: "dockerfile.v0",
FrontendAttrs: atters,
Session: []session.Attachable{authprovider.NewDockerAuthProvider()},
Session: []session.Attachable{authprovider.NewDockerAuthProvider(os.Stderr)},
}
cacheImports, err := parseCacheEntry(clix.StringSlice("cache-from"))
if err != nil {
Expand All @@ -131,35 +129,48 @@ func build(clix *cli.Context) error {
}
solveOpt.CacheImports = cacheImports
solveOpt.CacheExports = cacheExports

exportEntry := client.ExportEntry{
Type: "image",
Attrs: map[string]string{},
}
switch {
case clix.Bool("dry"):
solveOpt.Exporter = ""
case clix.Bool("local"):
solveOpt.Exporter = "local"
solveOpt.ExporterAttrs["output"] = clix.String("output")
exportEntry.Type = "local"
exportEntry.Attrs["output"] = clix.String("output")
case clix.Bool("oci"):
solveOpt.Exporter = "oci"
solveOpt.ExporterAttrs["output"] = clix.String("output")
exportEntry.Type = "oci"
exportEntry.Attrs["output"] = clix.String("output")
default:
ref := clix.String("ref")
if ref == "" {
return errors.New("ref is required when exporting image")
}
solveOpt.ExporterAttrs["name"] = ref
exportEntry.Attrs["name"] = ref
if clix.Bool("push") {
solveOpt.ExporterAttrs["push"] = "true"
exportEntry.Attrs["push"] = "true"
if clix.Bool("http") || strings.Contains(ref, "127.0.0.1") {
solveOpt.ExporterAttrs["registry.insecure"] = "true"
exportEntry.Attrs["registry.insecure"] = "true"
}
}
}
solveOpt.ExporterOutput, solveOpt.ExporterOutputDir, err = resolveExporterOutput(solveOpt.Exporter, solveOpt.ExporterAttrs["output"])
wc, dir, err := resolveExporterOutput(exportEntry.Type, exportEntry.Attrs["output"])
if err != nil {
return errors.Wrap(err, "invalid exporter-opt: output")
}
if solveOpt.ExporterOutput != nil || solveOpt.ExporterOutputDir != "" {
delete(solveOpt.ExporterAttrs, "output")
if wc != nil {
exportEntry.Output = func(attrs map[string]string) (io.WriteCloser, error) {
return wc, nil
}
}
if dir != "" {
exportEntry.OutputDir = dir
}
if exportEntry.Output != nil || exportEntry.OutputDir != "" {
delete(exportEntry.Attrs, "output")
}
solveOpt.Exports = []client.ExportEntry{exportEntry}
solveOpt.LocalDirs, err = attrMap(
fmt.Sprintf("context=%s", clix.String("context")),
fmt.Sprintf("dockerfile=%s", clix.String("dockerfile")),
Expand Down
65 changes: 34 additions & 31 deletions vendor.conf
@@ -1,39 +1,42 @@
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
github.com/moby/buildkit 457482ef67dfb7633a8efe35fa8fe25409973816
github.com/moby/buildkit e8c26ec2a167e37fd939bdaf6c1135c132e740a9
github.com/pkg/errors 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7
github.com/sirupsen/logrus d7b6bf5e4d26448fd977d07d745a2a66097ddecb
github.com/urfave/cli 693af58b4d51b8fcc7f9d89576da170765980581
golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c
github.com/sirupsen/logrus 67a7fdcf741f4d5cee82cb9800994ccfd4393ad0
github.com/urfave/cli 850de854cda08e97afb500b72967f1a56f0330e5
golang.org/x/sync cd5d95a43a6e21273425c7ae415d3df9ea832eeb
github.com/cpuguy83/go-md2man eda4fa589184806b8720ea3b9146491209877a10
github.com/konsorten/go-windows-terminal-sequences f55edac94c9bbba5d6182a4be46d86a2c9b5b50e
golang.org/x/crypto 8dd112bcdc25174059e45e07517d9fc663123347
golang.org/x/sys 70f52985063808f21fd6dd197895cdb9729443a5
golang.org/x/sys c1f44814a5cd81a6d1cb589ef1e528bc5d305e07
github.com/jaguilar/vt100 ad4c4a5743050fb7f88ce968dca9422f72a0e3f2 https://github.com/tonistiigi/vt100
github.com/morikuni/aec 39771216ff4c63d11f5e604076f9c45e8be1067b
github.com/opencontainers/go-digest ac19fd6e7483ff933754af248d80be865e543d22
github.com/tonistiigi/units 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2
golang.org/x/time 85acf8d2951cb2a3bde7632f9ff273ef0379bcbd
github.com/docker/cli 79e1cabf178592cdfe6fb7fd9b0e3ca50d524c24
google.golang.org/grpc 45890ffd9e533ea1d7555737205707de67ebe453
golang.org/x/net 16b79f2e4e95ea23b2bf9903c9809ff7b013ce85
github.com/golang/protobuf b5d812f8a3706043e23a9cd5babf2e5423744d30
google.golang.org/genproto c21a8b77f9f040598af1c8c5c0870568f1959df3
golang.org/x/text 5d731a35f4867878fc89f7744f7b6debb3beded6
github.com/gogo/protobuf c5a62797aee0054613cc578653a16c6237fef080
github.com/docker/docker-credential-helpers 123ba1b7cd646aaee13ba2e028b7c268db72e2b2
github.com/docker/docker fc01c2b481097a6057bec3cd1ab2d7b4488c50c4
github.com/opencontainers/runc 923a8f8a9a07aceada5fc48c4d37e905d9b019b5
github.com/Microsoft/go-winio 1a8911d1ed007260465c3bfbbc785ac6915a0bb8
github.com/containerd/continuity 004b46473808b3e7a4a3049c20e4376c91eb966d
github.com/docker/go-units 2fb04c6466a548a03cb009c5569ee1ab1e35398e
github.com/opencontainers/image-spec 92341961bccc36840a84120c9470e8bbdfa6d7c1
golang.org/x/time 555d28b269f0569763d25dbe1a237ae74c6bcc82
github.com/docker/cli d6edc912ce2c121baec4740162755dfea239577a
google.golang.org/grpc 2548a2203d4c51bda89005daf022f21ba0ff4e9f
golang.org/x/net a882066a44e04a21d46e51451c71e131344e830e
github.com/golang/protobuf ed6926b37a637426117ccab59282c3839528a700
google.golang.org/genproto 919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0
golang.org/x/text 4b67af870c6ffd08258ef1202f371aebccaf7b68
github.com/gogo/protobuf 5628607bb4c51c3157aacc3a50f0ab707582b805
github.com/docker/docker-credential-helpers f78081d1f7fef6ad74ad6b79368de6348386e591
github.com/docker/docker 65523469c7e6f100230ba500c1d28516ea6bd384
github.com/grpc-ecosystem/grpc-opentracing 8e809c8a86450a29b90dcc9efbf062d0fe6d9746
github.com/opentracing/opentracing-go 25a84ff92183e2f8ac018ba1db54f8a07b3c0e04
github.com/containerd/containerd bfbd1d09c9d7c96fabe50c59db104615ecff71c7
github.com/docker/distribution 6d62eb1d4a3515399431b713fde3ce5a9b40e8d5
github.com/opentracing/opentracing-go a7454ce5950e83caac9774ef32cc8979e5975f30
github.com/containerd/containerd c80fa7df17ad8979c2e45a3550d561aa1151b85f
github.com/docker/distribution dee21c0394b5e1e735412461dbd8d3a769e01799
github.com/google/shlex c34317bd91bf98fab745d77b03933cf8769299fe
github.com/tonistiigi/fsutil 998cf6ded857e84b748ae6a1778f0fd901616383
github.com/containerd/typeurl 2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
go.etcd.io/bbolt 63597a96ec0ad9e6d43c3fc81e809909e0237461
github.com/Microsoft/hcsshim a9997c3a96d98feed884046867ca520972f56466
github.com/gogo/googleapis 8558fb44d2f1fc223118afc694129d2c2d2924d1
github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb
github.com/opencontainers/image-spec 775207bd45b6cb8153ce218cc59351799217451f
github.com/tonistiigi/fsutil 0f039a052ca1da01626278199624b62aed9b3729
github.com/Microsoft/go-winio fc70bd9a86b5562b3b5eb1040e803febee1e90a1
github.com/opencontainers/runtime-spec 19e92ca817772b4466f2ed2b8d808dfb7a8ab4be
github.com/containerd/continuity 75bee3e2ccb6402e3a986ab8bd3b17003fc0fdec
github.com/opencontainers/runc 46def4cc4cb7bae86d8c80cedd43e96708218f0a
github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
github.com/containerd/ttrpc 4f1b8fe65a5c6ab7ecd74a227d6cde85b519af35
github.com/Microsoft/hcsshim 1e9909969aed4731e9d28995381d55fdc443ce5d
github.com/containerd/cgroups 82928e855c6c9fa78d1e0767c46e1b05168d623d
go.opencensus.io 3b5a343282fe4b4fccdb0f24cbd1d7169d20858a
github.com/golang/groupcache 611e8accdfc92c4187d399e95ce826046d4c8d73
github.com/gogo/googleapis b8d18e97a9a193c846d32143391f6033a9d69849
github.com/gofrs/flock 5135e617513b1e6e205a3a89b042249dee6730c8
18 changes: 17 additions & 1 deletion vendor/github.com/Microsoft/go-winio/file.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor/github.com/Microsoft/go-winio/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b91f239

Please sign in to comment.