Skip to content

Commit

Permalink
Bump BuildKit and depencencies
Browse files Browse the repository at this point in the history
Updates buildkit to current master (github.com/moby/buildkit): moby/buildkit@be6da00...7a4a2a2

Fixes build failures due to gRPC bumps;
18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:185:8:warning: NewContext not declared by package metadata (gosimple)
18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:69:13:warning: FromContext not declared by package metadata (gosimple)
18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:185:8:warning: NewContext not declared by package metadata (interfacer)
18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:69:13:warning: FromContext not declared by package metadata (interfacer)
18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:69:13:warning: FromContext not declared by package metadata (unconvert)
18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:185:8:warning: NewContext not declared by package metadata (unconvert)

Update vendored dependencies to match BuildKit:

- add github.com/grpc-ecosystem/grpc-opentracing dependency
- add github.com/opentracing/opentracing-go dependency
- downgrade github.com/pkg/errors to a tagged release: pkg/errors@v0.8.0...839d9e9
- github.com/containerd/continuity containerd/continuity@d8fb858...3e8f2ea
  - containerd/continuity#110 Add fstest.CreateSocket
- github.com/containerd/fifo containerd/fifo@fbfb6a1...3d5202a
  - Add apache license to files
- github.com/containerd/go-runc containerd/go-runc@4f6e87a...f271fa2
  - containerd/go-runc#37 runc: be able to get the full ps data (ps -f table)
  - containerd/go-runc#40 Add ConsoleSocket to RestoreOpts
- github.com/containerd/console containerd/console@2748ece...cb7008a
  - containerd/console#21 Add OpenBSD support
- github.com/syndtr/gocapability syndtr/gocapability@2c00dae...db04d3c
  - syndtr/gocapability#11 Add support for ambient capabilities
  - syndtr/gocapability#13 Fix issue moby#12: break too early
- golang.org/x/net golang/net@5561cd9...0ed95ab
- golang.org/x/text golang/text@f72d839...19e5161
- golang.org/x/time golang/time@a4bde12...f51c127
- github.com/tonistiigi/fsutil tonistiigi/fsutil@dea3a0d...93a0fd1
  - tonistiigi/fsutil#16 Don not hang on diskwriter errors
  - tonistiigi/fsutil#17 fix fd leak on send
  - tonistiigi/fsutil#18 avoid possible receiver panic/deadlock on sender error
  - tonistiigi/fsutil#20 receive: read stream to EOF on close
  - tonistiigi/fsutil#21 avoid not-exist error on walker
  - tonistiigi/fsutil#27 Generalize chtimes() implementation for non-linux platforms
  - tonistiigi/fsutil#28 walker: handle parents and subdirs in includepatterns

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah authored and vdemeester committed Jun 5, 2018
1 parent cbf4d50 commit e521f26
Show file tree
Hide file tree
Showing 49 changed files with 3,690 additions and 2,885 deletions.
1 change: 0 additions & 1 deletion integration/build/build_session_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ func testBuildWithSession(t *testing.T, client dclient.APIClient, daemonHost str
sess.Allow(fsProvider)

g, ctx := errgroup.WithContext(context.Background())

g.Go(func() error {
return sess.Run(ctx, client.DialSession)
})
Expand Down
18 changes: 9 additions & 9 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ github.com/mattn/go-shellwords v1.0.3
github.com/sirupsen/logrus v1.0.3
github.com/tchap/go-patricia v2.2.6
github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
golang.org/x/net 5561cd9b4330353950f399814f427425c0a26fd2
golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd
golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
github.com/docker/go-connections 7beb39f0b969b075d1325fecb092faf27fd357b6
golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
github.com/pmezard/go-difflib v1.0.0
github.com/gotestyourself/gotestyourself cf3a5ab914a2efa8bc838d09f5918c1d44d029
github.com/google/go-cmp v0.2.0
Expand Down Expand Up @@ -81,7 +81,7 @@ github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
github.com/coreos/go-systemd v17
github.com/godbus/dbus v4.0.0
github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
github.com/golang/protobuf v1.1.0

# gelf logging driver deps
Expand Down Expand Up @@ -113,11 +113,11 @@ go.opencensus.io v0.9.0

# containerd
github.com/containerd/containerd 4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac
github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
github.com/containerd/continuity 2d3749b4da569ac97ca63dccba5eee4f5ee2beab
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
github.com/containerd/continuity 3e8f2ea4b190484acb976a5b378d373429639a1a
github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
github.com/containerd/console 2748ece16665b45a47f884001d5831ec79703880
github.com/containerd/go-runc 4f6e87ae043f859a38255247b49c9abc262d002f
github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925
github.com/containerd/go-runc f271fa2021de855d4d918dbef83c5fe19db1bdd5
github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
github.com/dmcgowan/go-tar go1.10
github.com/stevvooe/ttrpc d4528379866b0ce7e9d71f3eb96f0582fc374577
Expand All @@ -129,7 +129,7 @@ github.com/cloudflare/cfssl 1.3.2
github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2
github.com/google/certificate-transparency-go 05f3323c246e07b553be6d6eea92ee871d716dbb
golang.org/x/crypto 1a580b3eff7814fc9b40602fd35256c63b50f491
golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
github.com/hashicorp/go-memdb cb9a474f84cc5e41b273b20c6927680b2a8776ad
github.com/hashicorp/go-immutable-radix 8e8ed81f8f0bf1bdd829593fdd5c29922c1ea990
github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
Expand All @@ -141,7 +141,7 @@ github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
github.com/prometheus/common ebdfc6da46522d58825777cf1f90490a5b1ef1d8
github.com/prometheus/procfs abf152e5f3e97f2fafac028d2cc06c1feb87ffa5
github.com/matttproud/golang_protobuf_extensions v1.0.0
github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9
github.com/pkg/errors v0.8.0
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0

# cli
Expand Down
16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/console.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/console_linux.go

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

18 changes: 17 additions & 1 deletion vendor/github.com/containerd/console/console_unix.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/console_windows.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/tc_darwin.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/tc_freebsd.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/tc_linux.go

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

51 changes: 51 additions & 0 deletions vendor/github.com/containerd/console/tc_openbsd_cgo.go

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

47 changes: 47 additions & 0 deletions vendor/github.com/containerd/console/tc_openbsd_nocgo.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/tc_solaris_cgo.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/console/tc_solaris_nocgo.go

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

18 changes: 17 additions & 1 deletion vendor/github.com/containerd/console/tc_unix.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/containerd/fifo/fifo.go

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

Loading

0 comments on commit e521f26

Please sign in to comment.