浏览代码

Merge pull request #872 from mavenugo/ann_alias

Allow network-scoped alias to be resolved for anonymous endpoint
Jana Radhakrishnan 9 年之前
父节点
当前提交
39e3fd2c29
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      libnetwork/network.go

+ 6 - 6
libnetwork/network.go

@@ -822,20 +822,20 @@ func (n *network) EndpointByID(id string) (Endpoint, error) {
 }
 }
 
 
 func (n *network) updateSvcRecord(ep *endpoint, localEps []*endpoint, isAdd bool) {
 func (n *network) updateSvcRecord(ep *endpoint, localEps []*endpoint, isAdd bool) {
-	if ep.isAnonymous() {
-		return
-	}
-
 	epName := ep.Name()
 	epName := ep.Name()
 	if iface := ep.Iface(); iface.Address() != nil {
 	if iface := ep.Iface(); iface.Address() != nil {
 		myAliases := ep.MyAliases()
 		myAliases := ep.MyAliases()
 		if isAdd {
 		if isAdd {
-			n.addSvcRecords(epName, iface.Address().IP, true)
+			if !ep.isAnonymous() {
+				n.addSvcRecords(epName, iface.Address().IP, true)
+			}
 			for _, alias := range myAliases {
 			for _, alias := range myAliases {
 				n.addSvcRecords(alias, iface.Address().IP, false)
 				n.addSvcRecords(alias, iface.Address().IP, false)
 			}
 			}
 		} else {
 		} else {
-			n.deleteSvcRecords(epName, iface.Address().IP, true)
+			if !ep.isAnonymous() {
+				n.deleteSvcRecords(epName, iface.Address().IP, true)
+			}
 			for _, alias := range myAliases {
 			for _, alias := range myAliases {
 				n.deleteSvcRecords(alias, iface.Address().IP, false)
 				n.deleteSvcRecords(alias, iface.Address().IP, false)
 			}
 			}