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

Add logdrivers to executor from swarmkit

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2016-07-08 11:43:42 -07:00
parent 6586f4f071
commit 8a50315f3c
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
daemon/cluster/executor/container/container.go
View file

@ -266,11 +266,20 @@ func getMountMask(m *api.Mount) string {
} }
func (c *containerConfig) hostConfig() *enginecontainer.HostConfig { func (c *containerConfig) hostConfig() *enginecontainer.HostConfig {
return &enginecontainer.HostConfig{ hc := &enginecontainer.HostConfig{
Resources: c.resources(), Resources: c.resources(),
Binds: c.binds(), Binds: c.binds(),
Tmpfs: c.tmpfs(), Tmpfs: c.tmpfs(),
} }
if c.task.LogDriver != nil {
hc.LogConfig = enginecontainer.LogConfig{
Type: c.task.LogDriver.Name,
Config: c.task.LogDriver.Options,
}
}
return hc
} }
// This handles the case of volumes that are defined inside a service Mount // This handles the case of volumes that are defined inside a service Mount