rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-04 10:36:14 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/default.go
View File

@ -28,6 +28,7 @@ func NewConfig() *Config {
Args: []string{ Args: []string{
"docker", "docker",
"-d", "-d",
"--log-driver", "syslog",
"-s", "overlay", "-s", "overlay",
"-b", "docker-sys", "-b", "docker-sys",
"--fixed-cidr", "172.18.42.1/16", "--fixed-cidr", "172.18.42.1/16",
@ -100,10 +101,8 @@ func NewConfig() *Config {
Environment: []string{ Environment: []string{
"DAEMON=true", "DAEMON=true",
}, },
Volumes: []string{ VolumesFrom: []string{
"/dev:/host/dev", "system-volumes",
"/lib/modules:/lib/modules",
"/lib/firmware:/lib/firmware",
}, },
}, },
"system-volumes": { "system-volumes": {
@ -115,12 +114,14 @@ func NewConfig() *Config {
CREATE_ONLY + "=true", CREATE_ONLY + "=true",
}, },
Volumes: []string{ Volumes: []string{
"/dev:/host/dev",
"/var/lib/rancher/conf:/var/lib/rancher/conf", "/var/lib/rancher/conf:/var/lib/rancher/conf",
"/lib/modules:/lib/modules", "/lib/modules:/lib/modules",
"/lib/firmware:/lib/firmware", "/lib/firmware:/lib/firmware",
"/var/run:/var/run", "/var/run:/var/run",
"/var/log:/var/log", "/var/log:/var/log",
}, },
LogDriver: "json-file",
}, },
"command-volumes": { "command-volumes": {
Image: "state", Image: "state",
@ -250,13 +251,10 @@ func NewConfig() *Config {
Image: "syslog", Image: "syslog",
Privileged: true, Privileged: true,
Net: "host", Net: "host",
Links: []string{
"cloud-init",
"network",
},
VolumesFrom: []string{ VolumesFrom: []string{
"system-volumes", "system-volumes",
}, },
LogDriver: "json-file",
}, },
"userdocker": { "userdocker": {
Image: "userdocker", Image: "userdocker",

7
docker/container.go
View File

@ -171,6 +171,12 @@ func (c *Container) Reset() *Container {
} }
func (c *Container) parseService() { 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) cfg, hostConfig, err := docker.Convert(c.ContainerCfg.Service)
if err != nil { if err != nil {
c.Err = err c.Err = err
@ -184,6 +190,7 @@ func (c *Container) parseService() {
c.remove = c.Config.Labels[config.REMOVE] != "false" c.remove = c.Config.Labels[config.REMOVE] != "false"
c.ContainerCfg.CreateOnly = c.Config.Labels[config.CREATE_ONLY] == "true" c.ContainerCfg.CreateOnly = c.Config.Labels[config.CREATE_ONLY] == "true"
c.ContainerCfg.ReloadConfig = c.Config.Labels[config.RELOAD_CONFIG] == "true" c.ContainerCfg.ReloadConfig = c.Config.Labels[config.RELOAD_CONFIG] == "true"
} }
func (c *Container) parseCmd() { func (c *Container) parseCmd() {

3
scripts/dockerimages/00-base
View File

@ -29,3 +29,6 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
sed -i 's/\(^sudo.*\)/\1rancher/g' /etc/group && \ sed -i 's/\(^sudo.*\)/\1rancher/g' /etc/group && \
echo '%sudo ALL=(ALL) ALL' >> /etc/sudoers echo '%sudo ALL=(ALL) ALL' >> /etc/sudoers
COPY scripts/dockerimages/scripts/inputrc /etc/inputrc COPY scripts/dockerimages/scripts/inputrc /etc/inputrc
COPY scripts/dockerimages/scripts/entry.sh /usr/sbin/entry.sh
ENTRYPOINT ["/usr/sbin/entry.sh"]

7
scripts/dockerimages/scripts/entry.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
if [ -e /host/dev ]; then
mount --bind /host/dev /dev
fi
exec "$@"

2
scripts/dockerimages/scripts/udev.sh
View File

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
mount --bind /host/dev /dev
if [ "$DAEMON" = true ]; then if [ "$DAEMON" = true ]; then
exec udevd exec udevd
fi fi