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

Fix bugs for multiple user docker daemons:

Browse Source 
1. Optimize the remove logic of the dind engine
2. Distinguish between user docker engine and Dind engine
This commit is contained in:
niusmallnan
2018-07-16 14:42:35 +08:00
committed by niusmallnan
parent 7ef84fbbe9
commit 5811357c58
3 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
util/util.go
View File

@@ -296,12 +296,9 @@ func RunCommandSequence(commandSequence []osYaml.StringandSlice) error {
return nil
}
func GenerateEngineScript(name string) error {
if _, err := os.Stat("/usr/bin/docker-" + name); err == nil {
err = os.Remove("/usr/bin/docker-" + name)
if err != nil {
return err
}
func GenerateDindEngineScript(name string) error {
if err := RemoveDindEngineScript(name); err != nil {
return err
}
bytes := []byte("/usr/bin/docker -H unix:///var/lib/m-user-docker/" + name + "/docker-" + name + ".sock $@")
@@ -313,3 +310,13 @@ func GenerateEngineScript(name string) error {
return nil
}
func RemoveDindEngineScript(name string) error {
if _, err := os.Stat("/usr/bin/docker-" + name); err == nil {
err = os.Remove("/usr/bin/docker-" + name)
if err != nil {
return err
}
}
return nil
}