浏览代码

Merge pull request #30259 from nishanttotla/dynamically-update-hostname

Make Docker automatically update hostname for Swarm node
Justin Cormack 8 年之前
父节点
当前提交
5c80826880
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      daemon/cluster/noderunner.go

+ 2 - 1
daemon/cluster/noderunner.go

@@ -94,8 +94,9 @@ func (n *nodeRunner) start(conf nodeStartConfig) error {
 		control = filepath.Join(n.cluster.runtimeRoot, controlSocket)
 	}
 
+	// Hostname is not set here. Instead, it is obtained from
+	// the node description that is reported periodically
 	swarmnodeConfig := swarmnode.Config{
-		Hostname:           n.cluster.config.Name,
 		ForceNewCluster:    conf.forceNewCluster,
 		ListenControlAPI:   control,
 		ListenRemoteAPI:    conf.ListenAddr,