提交 21789d8c 编写于 作者: P Priya Wadhwa

compile

上级 dfcfd6f2
......@@ -83,7 +83,7 @@ func (d *Driver) Create() error {
if err := oci.CreateNetwork(d.MachineName, defaultIPRange); err != nil {
glog.Warningf("unable to create docker network; node ip may not be stable: %v", err)
} else {
params.Network = defaultNetwork
params.Network = defaultIPRange
params.IP = "192.168.39.2"
}
......
......@@ -171,7 +171,7 @@ func CreateNetwork(name, ipRange string) error {
}
subnet := fmt.Sprintf("--subnet=%s", ipRange)
_, err = runCmd(exec.Command(Docker, "network", "create", "--driver=bridge", subnet, name))
_, err := runCmd(exec.Command(Docker, "network", "create", "--driver=bridge", subnet, name))
if err != nil {
return errors.Wrapf(err, "error creating network")
}
......@@ -179,9 +179,9 @@ func CreateNetwork(name, ipRange string) error {
return nil
}
// RemoveNetwork removes a network
func RemoveNetwork(name string) error {
if !networkExists {
// removeNetwork removes a network
func removeNetwork(name string) error {
if !networkExists(name) {
return nil
}
_, err := runCmd(exec.Command(Docker, "network", "remove", name))
......@@ -191,7 +191,8 @@ func RemoveNetwork(name string) error {
func networkExists(name string) bool {
rr, err := runCmd(exec.Command(Docker, "network", "ls", "--format", "{{.Name}}"))
if err != nil {
return errors.Wrap(err, "listing networks")
glog.Warningf("error listing networks: %v", err)
return false
}
networks := strings.Split(rr.Output(), "\n")
for _, n := range networks {
......
......@@ -86,7 +86,7 @@ func DeleteContainer(ociBin string, name string) error {
glog.Infof("couldn't shut down %s (might be okay): %v ", name, err)
}
if err := RemoveNetwork(name); err != nil {
if err := removeNetwork(name); err != nil {
glog.Warningf("error deleting network: %v", err)
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册