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

Always use bundled docker for system-docker.

Browse Source 
Fixes system-docker CLI breaking after a newer custom docker has been installed into the console container (e.g. into debian-console).
This commit is contained in:
Ivan Mikushin
2015-11-02 14:49:29 +05:00
parent a52919e0f0
commit 97807a52c1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/systemdocker/system-docker.go
View File

@@ -19,7 +19,7 @@ func Main() {
newEnv = append(newEnv, "DOCKER_HOST="+config.DOCKER_SYSTEM_HOST) newEnv = append(newEnv, "DOCKER_HOST="+config.DOCKER_SYSTEM_HOST)
os.Args[0] = "/usr/bin/docker" os.Args[0] = "/usr/bin/docker.dist"
if err := syscall.Exec(os.Args[0], os.Args, newEnv); err != nil { if err := syscall.Exec(os.Args[0], os.Args, newEnv); err != nil {
log.Fatal(err) log.Fatal(err)
} }