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

Rename userdocker to docker to be more consistent with other distros

Browse Source
This commit is contained in:
Darren Shepherd 2015-05-02 23:06:20 -07:00
parent 03d232ce87
commit 45d9c54b9a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/default.go
View File

@ -279,8 +279,8 @@ func NewConfig() *Config {
}, },
LogDriver: "json-file", LogDriver: "json-file",
}, },
"userdocker": { "docker": {
Image: "userdocker", Image: "docker",
Restart: "always", Restart: "always",
Privileged: true, Privileged: true,
Pid: "host", Pid: "host",
@ -296,15 +296,15 @@ func NewConfig() *Config {
"all-volumes", "all-volumes",
}, },
}, },
"userdockerwait": { "dockerwait": {
Image: "userdockerwait", Image: "dockerwait",
Net: "host", Net: "host",
Labels: project.NewSliceorMap(map[string]string{ Labels: project.NewSliceorMap(map[string]string{
DETACH: "false", DETACH: "false",
SCOPE: SYSTEM, SCOPE: SYSTEM,
}), }),
Links: []string{ Links: []string{
"userdocker", "docker",
}, },
VolumesFrom: []string{ VolumesFrom: []string{
"all-volumes", "all-volumes",

0
scripts/dockerimages/05-userdocker → scripts/dockerimages/05-docker
View File

0
scripts/dockerimages/11-userdockerwait → scripts/dockerimages/11-dockerwait
View File