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

latest rancher-compose, default.go -> os-config.yml

Browse Source 
also, gofmt
This commit is contained in:
Ivan Mikushin
2015-06-16 01:58:16 +05:00
parent e8aa88530f
commit dff70f8362
16 changed files with 474 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
init/bootstrap.go
View File

@@ -70,7 +70,7 @@ outer:
// copy
udev := *cfg.BootstrapContainers["udev"]
udev.Links = append(udev.Links, "autoformat")
udev.Links = project.NewMaporColonSlice(append(udev.Links.Slice(), "autoformat"))
udev.LogDriver = "json-file"
err := docker.RunServices("autoformat", cfg, map[string]*project.ServiceConfig{
@@ -78,13 +78,13 @@ outer:
Net: "none",
Privileged: true,
Image: "autoformat",
Command: format,
Command: project.NewCommand(format),
Labels: project.NewSliceorMap(map[string]string{
config.DETACH: "false",
config.SCOPE: config.SYSTEM,
}),
LogDriver: "json-file",
Environment: project.NewMaporslice([]string{
Environment: project.NewMaporEqualSlice([]string{
"MAGIC=" + boot2dockerMagic,
}),
},

18
init/init.go
View File

@@ -34,16 +34,16 @@ var (
"/var/lib/rancher/state/opt",
}
mounts [][]string = [][]string{
[]string{"devtmpfs", "/dev", "devtmpfs", ""},
[]string{"none", "/dev/pts", "devpts", ""},
[]string{"none", "/etc/docker", "tmpfs", ""},
[]string{"none", "/proc", "proc", ""},
[]string{"none", "/run", "tmpfs", ""},
[]string{"none", "/sys", "sysfs", ""},
[]string{"none", "/sys/fs/cgroup", "tmpfs", ""},
{"devtmpfs", "/dev", "devtmpfs", ""},
{"none", "/dev/pts", "devpts", ""},
{"none", "/etc/docker", "tmpfs", ""},
{"none", "/proc", "proc", ""},
{"none", "/run", "tmpfs", ""},
{"none", "/sys", "sysfs", ""},
{"none", "/sys/fs/cgroup", "tmpfs", ""},
}
postMounts [][]string = [][]string{
[]string{"none", "/var/run", "tmpfs", ""},
{"none", "/var/run", "tmpfs", ""},
}
cgroups []string = []string{
"blkio",
@@ -123,7 +123,7 @@ func mountCgroups(cfg *config.Config) error {
}
err = createMounts([][]string{
[]string{"none", "sys/fs/cgroup/" + cgroup, "cgroup", cgroup},
{"none", "sys/fs/cgroup/" + cgroup, "cgroup", cgroup},
}...)
if err != nil {
return err