浏览代码

Merge pull request #1504 from aboch/ports

Reset endpoint port info on connectivity revoke in bridge driver
Madhu Venugopal 8 年之前
父节点
当前提交
3d08c3099a
共有 2 个文件被更改,包括 8 次插入0 次删除
  1. 2 0
      libnetwork/circle.yml
  2. 6 0
      libnetwork/drivers/bridge/bridge.go

+ 2 - 0
libnetwork/circle.yml

@@ -1,4 +1,6 @@
 machine:
 machine:
+  environment:
+    GODIST: "go1.7.1.linux-amd64.tar.gz"
   services:
   services:
     - docker
     - docker
 
 

+ 6 - 0
libnetwork/drivers/bridge/bridge.go

@@ -1318,6 +1318,12 @@ func (d *driver) RevokeExternalConnectivity(nid, eid string) error {
 		logrus.Warn(err)
 		logrus.Warn(err)
 	}
 	}
 
 
+	endpoint.portMapping = nil
+
+	if err = d.storeUpdate(endpoint); err != nil {
+		return fmt.Errorf("failed to update bridge endpoint %s to store: %v", endpoint.id[0:7], err)
+	}
+
 	return nil
 	return nil
 }
 }