diff --git a/compose/project.go b/compose/project.go index e2edb60d..340205e6 100644 --- a/compose/project.go +++ b/compose/project.go @@ -51,7 +51,9 @@ func RunServiceSet(name string, cfg *config.CloudConfig, configs map[string]*com if err != nil { return nil, err } - return p, p.Up(context.Background(), options.Up{}) + return p, p.Up(context.Background(), options.Up{ + Log: cfg.Rancher.Log, + }) } func GetProject(cfg *config.CloudConfig, networkingAvailable bool) (*project.Project, error) { diff --git a/init/sysinit.go b/init/sysinit.go index cd7a1008..6e50975c 100644 --- a/init/sysinit.go +++ b/init/sysinit.go @@ -102,6 +102,7 @@ func SysInit() error { Create: options.Create{ NoRecreate: true, }, + Log: cfg.Rancher.Log, }) }, func(cfg *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/trash.conf b/trash.conf index a8ea6ae6..b1bb1705 100644 --- a/trash.conf +++ b/trash.conf @@ -15,7 +15,7 @@ github.com/docker/docker 8ba9ee769ba6c451e1d2abf05368580323201667 https://github github.com/docker/engine-api v0.3.3 github.com/docker/go-connections v0.2.0 github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3 -github.com/docker/libcompose 11654201ca45d7fdbbb31da33d762321dd057ee5 https://github.com/rancher/libcompose.git +github.com/docker/libcompose 8cfb76082bb536e8e76bd51de9db8cdda2c27601 https://github.com/rancher/libcompose.git github.com/docker/libnetwork v0.5.6 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205 diff --git a/vendor/github.com/docker/libcompose/docker/service.go b/vendor/github.com/docker/libcompose/docker/service.go index 573f0151..4995f726 100644 --- a/vendor/github.com/docker/libcompose/docker/service.go +++ b/vendor/github.com/docker/libcompose/docker/service.go @@ -292,6 +292,10 @@ func (s *Service) up(ctx context.Context, imageName string, create bool, options } } + if options.Log { + go c.Log(ctx, true) + } + return c.Up(ctx, imageName) }) } diff --git a/vendor/github.com/docker/libcompose/project/options/types.go b/vendor/github.com/docker/libcompose/project/options/types.go index d795e1f4..f826f166 100644 --- a/vendor/github.com/docker/libcompose/project/options/types.go +++ b/vendor/github.com/docker/libcompose/project/options/types.go @@ -31,6 +31,7 @@ type Create struct { // Up holds options of compose up. type Up struct { Create + Log bool } // ImageType defines the type of image (local, all)