kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #37691 from tiborvass/tmp-disable-bridge

Browse source 
builder: temporarily disable bridge networking when using buildkit
This commit is contained in:
Tibor Vass 2018-08-21 20:41:57 -07:00 committed by GitHub
commit 3ba4f9b221
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
builder/builder-next/executor_unix.go
View file

@ -18,16 +18,13 @@ import (
const networkName = "bridge" const networkName = "bridge"
func init() {
// FIXME: https://github.com/moby/moby/issues/37676
runcexecutor.DisableSubReaper()
}
func newExecutor(root string, net libnetwork.NetworkController) (executor.Executor, error) { func newExecutor(root string, net libnetwork.NetworkController) (executor.Executor, error) {
// FIXME: fix bridge networking
_ = bridgeProvider{}
return runcexecutor.New(runcexecutor.Opt{ return runcexecutor.New(runcexecutor.Opt{
Root: filepath.Join(root, "executor"), Root: filepath.Join(root, "executor"),
CommandCandidates: []string{"docker-runc", "runc"}, CommandCandidates: []string{"docker-runc", "runc"},
}, &bridgeProvider{NetworkController: net}) }, nil)
} }
type bridgeProvider struct { type bridgeProvider struct {

2
vendor.conf
View file

@ -26,7 +26,7 @@ github.com/imdario/mergo v0.3.6
golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca
# buildkit # buildkit
github.com/moby/buildkit 46f9075ab68a07df2c40ae6e240ce4f9392b3a66 git://github.com/tiborvass/buildkit.git github.com/moby/buildkit 49906c62925ed429ec9174a0b6869982967f1a39
github.com/tonistiigi/fsutil b19464cd1b6a00773b4f2eb7acf9c30426f9df42 github.com/tonistiigi/fsutil b19464cd1b6a00773b4f2eb7acf9c30426f9df42
github.com/grpc-ecosystem/grpc-opentracing 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 github.com/grpc-ecosystem/grpc-opentracing 8e809c8a86450a29b90dcc9efbf062d0fe6d9746
github.com/opentracing/opentracing-go 1361b9cd60be79c4c3a7fa9841b3c132e40066a7 github.com/opentracing/opentracing-go 1361b9cd60be79c4c3a7fa9841b3c132e40066a7

6
vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go generated vendored
View file

@ -404,12 +404,6 @@ func (s *forwardIO) writeCloserToFile(wc io.WriteCloser) (*os.File, error) {
var subReaperOnce sync.Once var subReaperOnce sync.Once
var subReaperError error var subReaperError error
// DisableSubReaper prevents setting subreaper on the current process.
// Do not rely on this function it may change or be removed.
func DisableSubReaper() {
subReaperOnce.Do(func() {})
}
func setSubReaper() error { func setSubReaper() error {
subReaperOnce.Do(func() { subReaperOnce.Do(func() {
subReaperError = runcsystem.SetSubreaper(1) subReaperError = runcsystem.SetSubreaper(1)

2
vendor/github.com/moby/buildkit/vendor.conf generated vendored
View file

@ -14,7 +14,7 @@ google.golang.org/grpc v1.12.0
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7 github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd
github.com/gogo/protobuf v1.0.0 github.com/gogo/protobuf v1.0.0
github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef github.com/gogo/googleapis b23578765ee54ff6bceff57f397d833bf4ca6869
github.com/golang/protobuf v1.1.0 github.com/golang/protobuf v1.1.0
github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b
github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/image-spec v1.0.1