{"action":"created","comment":{"url":"https://api.github.com/repos/docker/docker/pulls/comments/29561098","id":29561098,"diff_hunk":"@@ -552,6 +553,22 @@ would be 2*300M, so processes can use 300M swap memory as well.\n We set both memory and swap memory, so the processes in the container can use\n 300M memory and 700M swap memory.\n \n+By default, processes in a container are killed if an out-of-memory (OOM) occurs.\n+To disable this behaviour, use the `--oom-kill-disable` option. Disabling the OOM killer\n+should only be done on containers that have the `-m/--memory` option set.\n+\n+Examples:\n+\n+    $ docker run -ti -m 100M --oom-kill-disable ubuntu:14.04 /bin/bash","path":"docs/sources/reference/run.md","position":18,"original_position":18,"commit_id":"ee684f3cc53bfbe5de7dadeb4e307b428a756aef","original_commit_id":"ee684f3cc53bfbe5de7dadeb4e307b428a756aef","user":{"login":"moxiegirl","id":1347209,"avatar_url":"https://avatars.githubusercontent.com/u/1347209?v=3","gravatar_id":"","url":"https://api.github.com/users/moxiegirl","html_url":"https://github.com/moxiegirl","followers_url":"https://api.github.com/users/moxiegirl/followers","following_url":"https://api.github.com/users/moxiegirl/following{/other_user}","gists_url":"https://api.github.com/users/moxiegirl/gists{/gist_id}","starred_url":"https://api.github.com/users/moxiegirl/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/moxiegirl/subscriptions","organizations_url":"https://api.github.com/users/moxiegirl/orgs","repos_url":"https://api.github.com/users/moxiegirl/repos","events_url":"https://api.github.com/users/moxiegirl/events{/privacy}","received_events_url":"https://api.github.com/users/moxiegirl/received_events","type":"User","site_admin":false},"body":"Based on the reference you wrote, I expected to see:\r\n\r\n```\r\n$ docker run -ti -m 100M --oom-kill-disable=true ubuntu:14.04 /bin/bash\r\n```\r\n\r\nWhy is that not here?","created_at":"2015-05-03T22:38:53Z","updated_at":"2015-05-03T22:38:53Z","html_url":"https://github.com/docker/docker/pull/11034#discussion_r29561098","pull_request_url":"https://api.github.com/repos/docker/docker/pulls/11034","_links":{"self":{"href":"https://api.github.com/repos/docker/docker/pulls/comments/29561098"},"html":{"href":"https://github.com/docker/docker/pull/11034#discussion_r29561098"},"pull_request":{"href":"https://api.github.com/repos/docker/docker/pulls/11034"}}},"pull_request":{"url":"https://api.github.com/repos/docker/docker/pulls/11034","id":30057729,"html_url":"https://github.com/docker/docker/pull/11034","diff_url":"https://github.com/docker/docker/pull/11034.diff","patch_url":"https://github.com/docker/docker/pull/11034.patch","issue_url":"https://api.github.com/repos/docker/docker/issues/11034","number":11034,"state":"open","locked":false,"title":"enable cgroups memory.oom_control","user":{"login":"HuKeping","id":9958621,"avatar_url":"https://avatars.githubusercontent.com/u/9958621?v=3","gravatar_id":"","url":"https://api.github.com/users/HuKeping","html_url":"https://github.com/HuKeping","followers_url":"https://api.github.com/users/HuKeping/followers","following_url":"https://api.github.com/users/HuKeping/following{/other_user}","gists_url":"https://api.github.com/users/HuKeping/gists{/gist_id}","starred_url":"https://api.github.com/users/HuKeping/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HuKeping/subscriptions","organizations_url":"https://api.github.com/users/HuKeping/orgs","repos_url":"https://api.github.com/users/HuKeping/repos","events_url":"https://api.github.com/users/HuKeping/events{/privacy}","received_events_url":"https://api.github.com/users/HuKeping/received_events","type":"User","site_admin":false},"body":"This PR is related to #11026 \r\n\r\ncloses #11026","created_at":"2015-02-26T08:11:06Z","updated_at":"2015-05-03T22:38:53Z","closed_at":null,"merged_at":null,"merge_commit_sha":"60adf11c9ea30d9a94c609aeac2e2dd10c22f7f6","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/docker/docker/pulls/11034/commits","review_comments_url":"https://api.github.com/repos/docker/docker/pulls/11034/comments","review_comment_url":"https://api.github.com/repos/docker/docker/pulls/comments{/number}","comments_url":"https://api.github.com/repos/docker/docker/issues/11034/comments","statuses_url":"https://api.github.com/repos/docker/docker/statuses/ee684f3cc53bfbe5de7dadeb4e307b428a756aef","head":{"label":"HuKeping:oom_kill_disable","ref":"oom_kill_disable","sha":"ee684f3cc53bfbe5de7dadeb4e307b428a756aef","user":{"login":"HuKeping","id":9958621,"avatar_url":"https://avatars.githubusercontent.com/u/9958621?v=3","gravatar_id":"","url":"https://api.github.com/users/HuKeping","html_url":"https://github.com/HuKeping","followers_url":"https://api.github.com/users/HuKeping/followers","following_url":"https://api.github.com/users/HuKeping/following{/other_user}","gists_url":"https://api.github.com/users/HuKeping/gists{/gist_id}","starred_url":"https://api.github.com/users/HuKeping/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HuKeping/subscriptions","organizations_url":"https://api.github.com/users/HuKeping/orgs","repos_url":"https://api.github.com/users/HuKeping/repos","events_url":"https://api.github.com/users/HuKeping/events{/privacy}","received_events_url":"https://api.github.com/users/HuKeping/received_events","type":"User","site_admin":false},"repo":{"id":28956765,"name":"docker","full_name":"HuKeping/docker","owner":{"login":"HuKeping","id":9958621,"avatar_url":"https://avatars.githubusercontent.com/u/9958621?v=3","gravatar_id":"","url":"https://api.github.com/users/HuKeping","html_url":"https://github.com/HuKeping","followers_url":"https://api.github.com/users/HuKeping/followers","following_url":"https://api.github.com/users/HuKeping/following{/other_user}","gists_url":"https://api.github.com/users/HuKeping/gists{/gist_id}","starred_url":"https://api.github.com/users/HuKeping/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HuKeping/subscriptions","organizations_url":"https://api.github.com/users/HuKeping/orgs","repos_url":"https://api.github.com/users/HuKeping/repos","events_url":"https://api.github.com/users/HuKeping/events{/privacy}","received_events_url":"https://api.github.com/users/HuKeping/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/HuKeping/docker","description":"Docker - the open-source application container engine","fork":true,"url":"https://api.github.com/repos/HuKeping/docker","forks_url":"https://api.github.com/repos/HuKeping/docker/forks","keys_url":"https://api.github.com/repos/HuKeping/docker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/HuKeping/docker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/HuKeping/docker/teams","hooks_url":"https://api.github.com/repos/HuKeping/docker/hooks","issue_events_url":"https://api.github.com/repos/HuKeping/docker/issues/events{/number}","events_url":"https://api.github.com/repos/HuKeping/docker/events","assignees_url":"https://api.github.com/repos/HuKeping/docker/assignees{/user}","branches_url":"https://api.github.com/repos/HuKeping/docker/branches{/branch}","tags_url":"https://api.github.com/repos/HuKeping/docker/tags","blobs_url":"https://api.github.com/repos/HuKeping/docker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/HuKeping/docker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/HuKeping/docker/git/refs{/sha}","trees_url":"https://api.github.com/repos/HuKeping/docker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/HuKeping/docker/statuses/{sha}","languages_url":"https://api.github.com/repos/HuKeping/docker/languages","stargazers_url":"https://api.github.com/repos/HuKeping/docker/stargazers","contributors_url":"https://api.github.com/repos/HuKeping/docker/contributors","subscribers_url":"https://api.github.com/repos/HuKeping/docker/subscribers","subscription_url":"https://api.github.com/repos/HuKeping/docker/subscription","commits_url":"https://api.github.com/repos/HuKeping/docker/commits{/sha}","git_commits_url":"https://api.github.com/repos/HuKeping/docker/git/commits{/sha}","comments_url":"https://api.github.com/repos/HuKeping/docker/comments{/number}","issue_comment_url":"https://api.github.com/repos/HuKeping/docker/issues/comments{/number}","contents_url":"https://api.github.com/repos/HuKeping/docker/contents/{+path}","compare_url":"https://api.github.com/repos/HuKeping/docker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/HuKeping/docker/merges","archive_url":"https://api.github.com/repos/HuKeping/docker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/HuKeping/docker/downloads","issues_url":"https://api.github.com/repos/HuKeping/docker/issues{/number}","pulls_url":"https://api.github.com/repos/HuKeping/docker/pulls{/number}","milestones_url":"https://api.github.com/repos/HuKeping/docker/milestones{/number}","notifications_url":"https://api.github.com/repos/HuKeping/docker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/HuKeping/docker/labels{/name}","releases_url":"https://api.github.com/repos/HuKeping/docker/releases{/id}","created_at":"2015-01-08T08:37:37Z","updated_at":"2015-04-20T11:17:28Z","pushed_at":"2015-05-03T16:07:22Z","git_url":"git://github.com/HuKeping/docker.git","ssh_url":"git@github.com:HuKeping/docker.git","clone_url":"https://github.com/HuKeping/docker.git","svn_url":"https://github.com/HuKeping/docker","homepage":"http://www.docker.com","size":52475,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":false,"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":"15313dfdf38ecaa0dc93005f1c3824491fbb3b96","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}","created_at":"2013-01-18T18:10:57Z","updated_at":"2015-05-03T21:25:28Z","pushed_at":"2015-05-03T19:42:38Z","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":193097,"stargazers_count":21318,"watchers_count":21318,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":4962,"mirror_url":null,"open_issues_count":957,"forks":4962,"open_issues":957,"watchers":21318,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/docker/docker/pulls/11034"},"html":{"href":"https://github.com/docker/docker/pull/11034"},"issue":{"href":"https://api.github.com/repos/docker/docker/issues/11034"},"comments":{"href":"https://api.github.com/repos/docker/docker/issues/11034/comments"},"review_comments":{"href":"https://api.github.com/repos/docker/docker/pulls/11034/comments"},"review_comment":{"href":"https://api.github.com/repos/docker/docker/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/docker/docker/pulls/11034/commits"},"statuses":{"href":"https://api.github.com/repos/docker/docker/statuses/ee684f3cc53bfbe5de7dadeb4e307b428a756aef"}}}}