{"action":"created","comment":{"url":"https://api.github.com/repos/docker/docker/pulls/comments/80102346","id":80102346,"diff_hunk":"@@ -597,7 +597,10 @@ func cleanOperationalData(es *network.EndpointSettings) {\n }\n \n func (daemon *Daemon) updateNetworkConfig(container *container.Container, n libnetwork.Network, endpointConfig *networktypes.EndpointSettings, updateSettings bool) error {\n-\tif !containertypes.NetworkMode(n.Name()).IsUserDefined() {\n+\tendpointConfig.DNS = daemon.configStore.DNS\n+\n+\tif !container.EnableServiceDiscoveryOnDefaultNetwork() &&","path":"daemon/container_operations.go","position":null,"original_position":7,"commit_id":"6f74866c2b0f2c9a3779d500ac58590e310af2d9","original_commit_id":"88b0628221d672dbdb24c469a0f9244b7c501f75","user":{"login":"msabansal","id":14339337,"avatar_url":"https://avatars.githubusercontent.com/u/14339337?v=3","gravatar_id":"","url":"https://api.github.com/users/msabansal","html_url":"https://github.com/msabansal","followers_url":"https://api.github.com/users/msabansal/followers","following_url":"https://api.github.com/users/msabansal/following{/other_user}","gists_url":"https://api.github.com/users/msabansal/gists{/gist_id}","starred_url":"https://api.github.com/users/msabansal/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/msabansal/subscriptions","organizations_url":"https://api.github.com/users/msabansal/orgs","repos_url":"https://api.github.com/users/msabansal/repos","events_url":"https://api.github.com/users/msabansal/events{/privacy}","received_events_url":"https://api.github.com/users/msabansal/received_events","type":"User","site_admin":false},"body":"I have moved this to the next line otherwise compose complains to bring up containers in the default nat network in windows.","created_at":"2016-09-22T18:12:00Z","updated_at":"2016-09-22T18:12:00Z","html_url":"https://github.com/docker/docker/pull/25987#discussion_r80102346","pull_request_url":"https://api.github.com/repos/docker/docker/pulls/25987","_links":{"self":{"href":"https://api.github.com/repos/docker/docker/pulls/comments/80102346"},"html":{"href":"https://github.com/docker/docker/pull/25987#discussion_r80102346"},"pull_request":{"href":"https://api.github.com/repos/docker/docker/pulls/25987"}}},"pull_request":{"url":"https://api.github.com/repos/docker/docker/pulls/25987","id":82584892,"html_url":"https://github.com/docker/docker/pull/25987","diff_url":"https://github.com/docker/docker/pull/25987.diff","patch_url":"https://github.com/docker/docker/pull/25987.patch","issue_url":"https://api.github.com/repos/docker/docker/issues/25987","number":25987,"state":"open","locked":false,"title":"Support for Windows service discovery","user":{"login":"msabansal","id":14339337,"avatar_url":"https://avatars.githubusercontent.com/u/14339337?v=3","gravatar_id":"","url":"https://api.github.com/users/msabansal","html_url":"https://github.com/msabansal","followers_url":"https://api.github.com/users/msabansal/followers","following_url":"https://api.github.com/users/msabansal/following{/other_user}","gists_url":"https://api.github.com/users/msabansal/gists{/gist_id}","starred_url":"https://api.github.com/users/msabansal/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/msabansal/subscriptions","organizations_url":"https://api.github.com/users/msabansal/orgs","repos_url":"https://api.github.com/users/msabansal/repos","events_url":"https://api.github.com/users/msabansal/events{/privacy}","received_events_url":"https://api.github.com/users/msabansal/received_events","type":"User","site_admin":false},"body":"<!--\r\nPlease make sure you've read and understood our contributing guidelines;\r\nhttps://github.com/docker/docker/blob/master/CONTRIBUTING.md\r\n\r\n** Make sure all your commits include a signature generated with `git commit -s` **\r\n\r\nFor additional information on our contributing process, read our contributing\r\nguide https://docs.docker.com/opensource/code/\r\n\r\nIf this is a bug fix, make sure your description includes \"fixes #xxxx\", or\r\n\"closes #xxxx\"\r\n\r\nPlease provide the following information:\r\n-->\r\n\r\n**- What I did**\r\nThese changes are required to enable service discovery in Windows.\r\n\r\n**- How I did it**\r\nEnabling service discovery requires the following changes:\r\n- Enable service discovery for windows in libnetwork\r\n- Enable unqualified name resolution for containers which have endpoints in networks that support service discovery\r\n- Enable service discovery for default network (nat) in windows as windows has only one nat network and we fill that this is required.\r\n- Allow setting DNS servers on endpoints aswell because in windows DNS servers are associated with network endpoints and not sandboxes.\r\n\r\n**- How to verify it**\r\n\r\n**- Description for the changelog**\r\n<!--\r\nWrite a short (one line) summary that describes the changes in this\r\npull request for inclusion in the changelog:\r\n-->\r\n\r\n\r\n**- A picture of a cute animal (not mandatory but encouraged)**\r\n\r\n**- Libnetwork vendoring:**\r\nFixes #25848\r\nFixes #25608\r\nFixes #26075 ","created_at":"2016-08-24T17:33:30Z","updated_at":"2016-09-22T18:12:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f912b292b8975bf279bb10f7a3b41cd5d552c048","assignee":null,"assignees":[],"milestone":{"url":"https://api.github.com/repos/docker/docker/milestones/56","html_url":"https://github.com/docker/docker/milestones/1.13.0","labels_url":"https://api.github.com/repos/docker/docker/milestones/56/labels","id":1839404,"number":56,"title":"1.13.0","description":"","creator":{"login":"thaJeztah","id":1804568,"avatar_url":"https://avatars.githubusercontent.com/u/1804568?v=3","gravatar_id":"","url":"https://api.github.com/users/thaJeztah","html_url":"https://github.com/thaJeztah","followers_url":"https://api.github.com/users/thaJeztah/followers","following_url":"https://api.github.com/users/thaJeztah/following{/other_user}","gists_url":"https://api.github.com/users/thaJeztah/gists{/gist_id}","starred_url":"https://api.github.com/users/thaJeztah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thaJeztah/subscriptions","organizations_url":"https://api.github.com/users/thaJeztah/orgs","repos_url":"https://api.github.com/users/thaJeztah/repos","events_url":"https://api.github.com/users/thaJeztah/events{/privacy}","received_events_url":"https://api.github.com/users/thaJeztah/received_events","type":"User","site_admin":false},"open_issues":83,"closed_issues":235,"state":"open","created_at":"2016-06-20T22:51:25Z","updated_at":"2016-09-22T16:55:58Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/docker/docker/pulls/25987/commits","review_comments_url":"https://api.github.com/repos/docker/docker/pulls/25987/comments","review_comment_url":"https://api.github.com/repos/docker/docker/pulls/comments{/number}","comments_url":"https://api.github.com/repos/docker/docker/issues/25987/comments","statuses_url":"https://api.github.com/repos/docker/docker/statuses/6f74866c2b0f2c9a3779d500ac58590e310af2d9","head":{"label":"msabansal:dnssupport","ref":"dnssupport","sha":"6f74866c2b0f2c9a3779d500ac58590e310af2d9","user":{"login":"msabansal","id":14339337,"avatar_url":"https://avatars.githubusercontent.com/u/14339337?v=3","gravatar_id":"","url":"https://api.github.com/users/msabansal","html_url":"https://github.com/msabansal","followers_url":"https://api.github.com/users/msabansal/followers","following_url":"https://api.github.com/users/msabansal/following{/other_user}","gists_url":"https://api.github.com/users/msabansal/gists{/gist_id}","starred_url":"https://api.github.com/users/msabansal/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/msabansal/subscriptions","organizations_url":"https://api.github.com/users/msabansal/orgs","repos_url":"https://api.github.com/users/msabansal/repos","events_url":"https://api.github.com/users/msabansal/events{/privacy}","received_events_url":"https://api.github.com/users/msabansal/received_events","type":"User","site_admin":false},"repo":{"id":50878862,"name":"docker","full_name":"msabansal/docker","owner":{"login":"msabansal","id":14339337,"avatar_url":"https://avatars.githubusercontent.com/u/14339337?v=3","gravatar_id":"","url":"https://api.github.com/users/msabansal","html_url":"https://github.com/msabansal","followers_url":"https://api.github.com/users/msabansal/followers","following_url":"https://api.github.com/users/msabansal/following{/other_user}","gists_url":"https://api.github.com/users/msabansal/gists{/gist_id}","starred_url":"https://api.github.com/users/msabansal/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/msabansal/subscriptions","organizations_url":"https://api.github.com/users/msabansal/orgs","repos_url":"https://api.github.com/users/msabansal/repos","events_url":"https://api.github.com/users/msabansal/events{/privacy}","received_events_url":"https://api.github.com/users/msabansal/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/msabansal/docker","description":"Docker - the open-source application container engine","fork":true,"url":"https://api.github.com/repos/msabansal/docker","forks_url":"https://api.github.com/repos/msabansal/docker/forks","keys_url":"https://api.github.com/repos/msabansal/docker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/msabansal/docker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/msabansal/docker/teams","hooks_url":"https://api.github.com/repos/msabansal/docker/hooks","issue_events_url":"https://api.github.com/repos/msabansal/docker/issues/events{/number}","events_url":"https://api.github.com/repos/msabansal/docker/events","assignees_url":"https://api.github.com/repos/msabansal/docker/assignees{/user}","branches_url":"https://api.github.com/repos/msabansal/docker/branches{/branch}","tags_url":"https://api.github.com/repos/msabansal/docker/tags","blobs_url":"https://api.github.com/repos/msabansal/docker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/msabansal/docker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/msabansal/docker/git/refs{/sha}","trees_url":"https://api.github.com/repos/msabansal/docker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/msabansal/docker/statuses/{sha}","languages_url":"https://api.github.com/repos/msabansal/docker/languages","stargazers_url":"https://api.github.com/repos/msabansal/docker/stargazers","contributors_url":"https://api.github.com/repos/msabansal/docker/contributors","subscribers_url":"https://api.github.com/repos/msabansal/docker/subscribers","subscription_url":"https://api.github.com/repos/msabansal/docker/subscription","commits_url":"https://api.github.com/repos/msabansal/docker/commits{/sha}","git_commits_url":"https://api.github.com/repos/msabansal/docker/git/commits{/sha}","comments_url":"https://api.github.com/repos/msabansal/docker/comments{/number}","issue_comment_url":"https://api.github.com/repos/msabansal/docker/issues/comments{/number}","contents_url":"https://api.github.com/repos/msabansal/docker/contents/{+path}","compare_url":"https://api.github.com/repos/msabansal/docker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/msabansal/docker/merges","archive_url":"https://api.github.com/repos/msabansal/docker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/msabansal/docker/downloads","issues_url":"https://api.github.com/repos/msabansal/docker/issues{/number}","pulls_url":"https://api.github.com/repos/msabansal/docker/pulls{/number}","milestones_url":"https://api.github.com/repos/msabansal/docker/milestones{/number}","notifications_url":"https://api.github.com/repos/msabansal/docker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/msabansal/docker/labels{/name}","releases_url":"https://api.github.com/repos/msabansal/docker/releases{/id}","deployments_url":"https://api.github.com/repos/msabansal/docker/deployments","created_at":"2016-02-01T23:22:20Z","updated_at":"2016-02-01T23:22:30Z","pushed_at":"2016-09-22T18:10:16Z","git_url":"git://github.com/msabansal/docker.git","ssh_url":"git@github.com:msabansal/docker.git","clone_url":"https://github.com/msabansal/docker.git","svn_url":"https://github.com/msabansal/docker","homepage":"http://www.docker.com","size":101577,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"docker:master","ref":"master","sha":"221d4fca0cc2b2b87556b459fea8342aeb271a81","user":{"login":"docker","id":5429470,"avatar_url":"https://avatars.githubusercontent.com/u/5429470?v=3","gravatar_id":"","url":"https://api.github.com/users/docker","html_url":"https://github.com/docker","followers_url":"https://api.github.com/users/docker/followers","following_url":"https://api.github.com/users/docker/following{/other_user}","gists_url":"https://api.github.com/users/docker/gists{/gist_id}","starred_url":"https://api.github.com/users/docker/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/docker/subscriptions","organizations_url":"https://api.github.com/users/docker/orgs","repos_url":"https://api.github.com/users/docker/repos","events_url":"https://api.github.com/users/docker/events{/privacy}","received_events_url":"https://api.github.com/users/docker/received_events","type":"Organization","site_admin":false},"repo":{"id":7691631,"name":"docker","full_name":"docker/docker","owner":{"login":"docker","id":5429470,"avatar_url":"https://avatars.githubusercontent.com/u/5429470?v=3","gravatar_id":"","url":"https://api.github.com/users/docker","html_url":"https://github.com/docker","followers_url":"https://api.github.com/users/docker/followers","following_url":"https://api.github.com/users/docker/following{/other_user}","gists_url":"https://api.github.com/users/docker/gists{/gist_id}","starred_url":"https://api.github.com/users/docker/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/docker/subscriptions","organizations_url":"https://api.github.com/users/docker/orgs","repos_url":"https://api.github.com/users/docker/repos","events_url":"https://api.github.com/users/docker/events{/privacy}","received_events_url":"https://api.github.com/users/docker/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/docker/docker","description":"Docker - the open-source application container engine","fork":false,"url":"https://api.github.com/repos/docker/docker","forks_url":"https://api.github.com/repos/docker/docker/forks","keys_url":"https://api.github.com/repos/docker/docker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/docker/docker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/docker/docker/teams","hooks_url":"https://api.github.com/repos/docker/docker/hooks","issue_events_url":"https://api.github.com/repos/docker/docker/issues/events{/number}","events_url":"https://api.github.com/repos/docker/docker/events","assignees_url":"https://api.github.com/repos/docker/docker/assignees{/user}","branches_url":"https://api.github.com/repos/docker/docker/branches{/branch}","tags_url":"https://api.github.com/repos/docker/docker/tags","blobs_url":"https://api.github.com/repos/docker/docker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/docker/docker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/docker/docker/git/refs{/sha}","trees_url":"https://api.github.com/repos/docker/docker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/docker/docker/statuses/{sha}","languages_url":"https://api.github.com/repos/docker/docker/languages","stargazers_url":"https://api.github.com/repos/docker/docker/stargazers","contributors_url":"https://api.github.com/repos/docker/docker/contributors","subscribers_url":"https://api.github.com/repos/docker/docker/subscribers","subscription_url":"https://api.github.com/repos/docker/docker/subscription","commits_url":"https://api.github.com/repos/docker/docker/commits{/sha}","git_commits_url":"https://api.github.com/repos/docker/docker/git/commits{/sha}","comments_url":"https://api.github.com/repos/docker/docker/comments{/number}","issue_comment_url":"https://api.github.com/repos/docker/docker/issues/comments{/number}","contents_url":"https://api.github.com/repos/docker/docker/contents/{+path}","compare_url":"https://api.github.com/repos/docker/docker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/docker/docker/merges","archive_url":"https://api.github.com/repos/docker/docker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/docker/docker/downloads","issues_url":"https://api.github.com/repos/docker/docker/issues{/number}","pulls_url":"https://api.github.com/repos/docker/docker/pulls{/number}","milestones_url":"https://api.github.com/repos/docker/docker/milestones{/number}","notifications_url":"https://api.github.com/repos/docker/docker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/docker/docker/labels{/name}","releases_url":"https://api.github.com/repos/docker/docker/releases{/id}","deployments_url":"https://api.github.com/repos/docker/docker/deployments","created_at":"2013-01-18T18:10:57Z","updated_at":"2016-09-22T18:02:04Z","pushed_at":"2016-09-22T18:10:20Z","git_url":"git://github.com/docker/docker.git","ssh_url":"git@github.com:docker/docker.git","clone_url":"https://github.com/docker/docker.git","svn_url":"https://github.com/docker/docker","homepage":"http://www.docker.com","size":210319,"stargazers_count":35220,"watchers_count":35220,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":10366,"mirror_url":null,"open_issues_count":1964,"forks":10366,"open_issues":1964,"watchers":35220,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/docker/docker/pulls/25987"},"html":{"href":"https://github.com/docker/docker/pull/25987"},"issue":{"href":"https://api.github.com/repos/docker/docker/issues/25987"},"comments":{"href":"https://api.github.com/repos/docker/docker/issues/25987/comments"},"review_comments":{"href":"https://api.github.com/repos/docker/docker/pulls/25987/comments"},"review_comment":{"href":"https://api.github.com/repos/docker/docker/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/docker/docker/pulls/25987/commits"},"statuses":{"href":"https://api.github.com/repos/docker/docker/statuses/6f74866c2b0f2c9a3779d500ac58590e310af2d9"}}}}
{"actor":{"display_login":"msabansal"}}