rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-11 19:42:24 +00:00
Code Issues Releases Wiki Activity

Fix 'rancher.log'

Browse Source
This commit is contained in:
Josh Curl 2016-06-06 15:31:34 -07:00
parent b83f0ec092
commit 4cb1d26cf9
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/project.go
View File

@ -51,7 +51,9 @@ func RunServiceSet(name string, cfg *config.CloudConfig, configs map[string]*com
if err != nil { if err != nil {
return nil, err 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) { func GetProject(cfg *config.CloudConfig, networkingAvailable bool) (*project.Project, error) {

1
init/sysinit.go
View File

@ -102,6 +102,7 @@ func SysInit() error {
Create: options.Create{ Create: options.Create{
NoRecreate: true, NoRecreate: true,
}, },
Log: cfg.Rancher.Log,
}) })
}, },
func(cfg *config.CloudConfig) (*config.CloudConfig, error) { func(cfg *config.CloudConfig) (*config.CloudConfig, error) {

2
trash.conf
View File

@ -15,7 +15,7 @@ github.com/docker/docker 8ba9ee769ba6c451e1d2abf05368580323201667 https://github
github.com/docker/engine-api v0.3.3 github.com/docker/engine-api v0.3.3
github.com/docker/go-connections v0.2.0 github.com/docker/go-connections v0.2.0
github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3 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/libnetwork v0.5.6
github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205 github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205

4
vendor/github.com/docker/libcompose/docker/service.go generated vendored
View File

@ -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) return c.Up(ctx, imageName)
}) })
} }

1
vendor/github.com/docker/libcompose/project/options/types.go generated vendored
View File

@ -31,6 +31,7 @@ type Create struct {
// Up holds options of compose up. // Up holds options of compose up.
type Up struct { type Up struct {
Create Create
Log bool
} }
// ImageType defines the type of image (local, all) // ImageType defines the type of image (local, all)