rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-03 15:54:24 +00:00
Code Issues Releases Wiki Activity

Support higher verion docker-ce as system-docker

Browse Source
This commit is contained in:
niusmallnan
2018-02-27 17:55:59 +08:00
committed by niusmallnan
parent a7ba5d045b
commit 43f483a5ef
5 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/control/user_docker.go
View File

@@ -175,14 +175,14 @@ func startDocker(cfg *config.CloudConfig) error {
return err
}
cmd := []string{"docker-runc", "exec", "--", info.ID, "env"}
cmd := []string{"system-docker-runc", "exec", "--", info.ID, "env"}
log.Info(dockerCfg.AppendEnv())
cmd = append(cmd, dockerCfg.AppendEnv()...)
cmd = append(cmd, dockerCommand...)
cmd = append(cmd, args...)
log.Infof("Running %v", cmd)
return syscall.Exec("/usr/bin/ros", cmd, os.Environ())
return syscall.Exec("/usr/bin/system-docker-runc", cmd, os.Environ())
}
func waitForPid(service string, project *project.Project) (int, error) {