rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Add syslog and udev hotplugging

Browse Source
This commit is contained in:
Darren Shepherd
2015-04-06 06:52:17 -07:00
parent 02606da59f
commit 7bb5e10b12
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker/container.go
View File

@@ -171,6 +171,12 @@ func (c *Container) Reset() *Container {
}
func (c *Container) parseService() {
if (c.ContainerCfg.Service.LogDriver == "" || c.ContainerCfg.Service.LogDriver == "syslog") &&
!util.Contains(c.ContainerCfg.Service.Links, "syslog") {
log.Debugf("Adding syslog link to %s\n", c.Name)
c.ContainerCfg.Service.Links = append(c.ContainerCfg.Service.Links, "syslog")
}
cfg, hostConfig, err := docker.Convert(c.ContainerCfg.Service)
if err != nil {
c.Err = err
@@ -184,6 +190,7 @@ func (c *Container) parseService() {
c.remove = c.Config.Labels[config.REMOVE] != "false"
c.ContainerCfg.CreateOnly = c.Config.Labels[config.CREATE_ONLY] == "true"
c.ContainerCfg.ReloadConfig = c.Config.Labels[config.RELOAD_CONFIG] == "true"
}
func (c *Container) parseCmd() {