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

Add tty and half way broken state handling

Browse Source
This commit is contained in:
Darren Shepherd
2015-02-16 16:38:49 -07:00
parent 3ab1f76ef0
commit 925a847ccc
11 changed files with 96 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/config.go
View File

@@ -41,7 +41,6 @@ type Config struct {
SystemDockerArgs []string `json:"systemDockerArgs,omitempty"`
UserContainers []ContainerConfig `json:"userContainser,omitempty"`
UserInit string `json:"userInit,omitempty"`
DockerBin string `json:"dockerBin,omitempty"`
Modules []string `json:"modules,omitempty"`
Respawn []string `json:"respawn,omitempty"`
}
@@ -71,17 +70,16 @@ func LoadConfig() (*Config, error) {
func NewConfig() *Config {
return &Config{
ConsoleContainer: "console",
DockerBin: "/usr/bin/docker",
Debug: true,
DockerEndpoint: "unix:/var/run/docker.sock",
Dns: []string{
"8.8.8.8",
"8.8.4.4",
},
ImagesPath: "/",
ImagesPattern: "images*.tar",
StateRequired: false,
//StateDev: "/dev/sda",
ImagesPath: "/",
ImagesPattern: "images*.tar",
StateRequired: false,
StateDev: "/dev/sda",
StateDevFSType: "ext4",
SysInit: "/sbin/init-sys",
SystemDockerArgs: []string{"docker", "-d", "-s", "overlay", "-b", "none"},
@@ -122,6 +120,7 @@ func NewConfig() *Config {
"--name", "userdocker",
"-d",
"--restart", "always",
"--pid", "host",
"--net", "host",
"--privileged",
"--volume", "/lib/modules:/lib/modules:ro",
@@ -136,16 +135,15 @@ func NewConfig() *Config {
"-d",
"--rm",
"--privileged",
"--volume", "/:/host:ro",
//"--volume", "/:/host:ro",
"--volume", "/lib/modules:/lib/modules:ro",
"--volume", "/usr/bin/docker:/usr/bin/docker:ro",
"--volume", "/usr/bin/system-docker:/usr/bin/system-docker:ro",
"--volume", "/init:/usr/bin/system-docker:ro",
"--volume", "/init:/usr/bin/respawn:ro",
"--volume", "/var/run/docker.sock:/var/run/system-docker.sock:ro",
"--volumes-from", "system-state",
"--net", "host",
"--pid", "host",
"-it",
"console",
},
},
@@ -153,15 +151,17 @@ func NewConfig() *Config {
RescueContainer: ContainerConfig{
Cmd: []string{
"--name", "rescue",
"-d",
"--rm",
"--privileged",
"--volume", "/:/host",
//"--volume", "/:/host",
"--volume", "/lib/modules:/lib/modules:ro",
"--volume", "/usr/bin/docker:/usr/bin/docker:ro",
"--volume", "/var/run/docker.sock:/var/run/docker.sock:ro",
"--volume", "/init:/usr/bin/system-docker:ro",
"--volume", "/init:/usr/bin/respawn:ro",
"--volume", "/var/run/docker.sock:/var/run/system-docker.sock:ro",
"--net", "host",
"--pid", "host",
"-it",
"rescue",
},
},