1
0
mirror of https://github.com/rancher/os.git synced 2025-09-02 23:34:57 +00:00

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

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

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,
}),
},