Qiang Huang
3004521c7f
Add support for kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: b6f1b4ad350cbf1f540797eee44520694237d47c
Component: engine
2015-08-19 23:56:55 +08:00
Sebastiaan van Stijn
6762d7b01d
Merge pull request #15482 from hqhq/hq_fix_run_doc
...
Add format description in run doc
Upstream-commit: 7ec7173b768295a7b47270ff31ecc87d9ffbbb62
Component: engine
2015-08-19 17:13:00 +02:00
Sebastiaan van Stijn
68987b8336
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
Upstream-commit: 59e49e1db0c4b59d8ca7334fdadade73755969b9
Component: engine
2015-08-19 17:04:23 +02:00
Philipp Wahala
27a001e73d
Small fix in dev env docs
...
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com >
Upstream-commit: fbc0ea32e87cb760c6402d3ded250e682c60b792
Component: engine
2015-08-19 10:53:55 +02:00
Qiang Huang
1edea74db3
Add format description in run doc
...
And only set false to --oom-kill-disable, we just need the default
value to show.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 2a468ed7e409f785a51969b48f0d34a4e0d88413
Component: engine
2015-08-19 10:11:08 +08:00
moxiegirl
87cbf1e8d4
Merge pull request #15671 from tonistiigi/fix-volume-userguide
...
Update volumes userguide
Upstream-commit: aacb47d628930273308187a0b2389e8f8cb0c63f
Component: engine
2015-08-18 18:57:24 -07:00
moxiegirl
51012044ae
Merge pull request #15676 from thaJeztah/fix-anchor-link
...
docs: fix anchor link on Ubuntu installation page Merging for @thaJeztah ....da ddadad dadada 🎼
Upstream-commit: 5fccbd124308a099a0e5ea76addcab5c0a7a952f
Component: engine
2015-08-18 18:55:56 -07:00
Morgan Bauer
717cb5744e
remove references to 'source repository'
...
- rewrite intro to Dockerfile reference usage section to remove
references to 'source repository'
- Closes #14714
- Fixes: #8648
- Updating with Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b143c05d64c4532b090d1f718ab93b4f7b1c466c
Component: engine
2015-08-18 15:50:42 -07:00
Sebastiaan van Stijn
84dd1a53ef
docs: fix anchor link on Ubuntu installation page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5dd28c1f9d5933c81c24c9d5fd478239438437f1
Component: engine
2015-08-18 23:41:00 +02:00
Mary Anthony
fdd77b46c5
Updating hashcode links to commands
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 85c2c771884aaa73b65753bdbdf31d596cd90111
Component: engine
2015-08-18 12:25:59 -07:00
Tonis Tiigi
c643d6fd66
Update volumes userguide
...
Fixes #15644
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: cc2aab7816f555f58ef3ccaed16537989ac683a7
Component: engine
2015-08-18 12:17:45 -07:00
moxiegirl
f01d1eb72b
Merge pull request #15510 from kblin/issue-14795
...
reference/run: Clarify the use of numeric UIDs
Upstream-commit: bba2551847835a42fba43ed0d461c58bb2ad963b
Component: engine
2015-08-18 09:43:16 -07:00
moxiegirl
68b94ae6c4
Merge pull request #15337 from phemmer/doc-builder-volume
...
add documentation clarifying behavior of VOLUME instruction
Upstream-commit: 7ae6a505f21237f30e862e0a6a24da711558bc29
Component: engine
2015-08-18 09:42:00 -07:00
Sebastiaan van Stijn
2e81e96300
Merge pull request #15605 from dharmit/15530-remove-the-terms-folder
...
Fixing docs to remove references to links under terms/
Upstream-commit: d7ac3fa863213b2841b4af309e677df72599b39d
Component: engine
2015-08-18 18:27:28 +02:00
Sven Dowideit
d138731095
use the Docker Hub as the product name
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 30cde97e5c9a35d47dd666e461c0ce83f2f69581
Component: engine
2015-08-18 21:13:57 +10:00
Kai Blin
7ca1dac319
reference/run: Some editorial changes
...
Based on the suggestions from @moxiegirl, some changes to make the wording more clear.
Signed-off-by: Kai Blin <kai@samba.org >
Upstream-commit: ba29d31c9cb205863d8d63542ef969e7c6fafcfe
Component: engine
2015-08-18 08:56:56 +02:00
moxiegirl
427a3b4bda
Merge pull request #15613 from mgrauer/update_docs_installation_mac_docker_machine_name
...
Update dev machine name to default in mac installation docs
Upstream-commit: 66112a7ae5313aff70ed5aebc2ed9d9ba2265d85
Component: engine
2015-08-17 19:05:34 -07:00
moxiegirl
dd213d0178
Merge pull request #15430 from charleswhchan/patch-2
...
Cleanup "Working with containers" page.
Upstream-commit: 5ab6883b9228a960052a0812b8529614937c66d3
Component: engine
2015-08-17 17:46:05 -07:00
Sebastiaan van Stijn
63ab074ee2
Merge pull request #15237 from charleswhchan/patch-3
...
Reformat /containers/(id)/resize to make it consistent with other sections.
Upstream-commit: bba762b19254b8315aa8d5a6a63cb00253eaa42c
Component: engine
2015-08-16 10:59:16 +02:00
Charles Chan
5ba2c88bd5
Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 6cd2d8946902eddab5e3902efeef3c7ffd748a1e
Component: engine
2015-08-15 19:47:01 -07:00
Sebastiaan van Stijn
f2f5327a6e
Merge pull request #14113 from dit4c/10348-exec-privileged
...
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
Michael Grauer
15e6133b8f
Update dev machine name to default in mac installation docs
...
Signed-off-by: Michael Grauer <michael.grauer@kitware.com >
Upstream-commit: f26045a53457fd99b0d5f20817f8b7b25db8b6d0
Component: engine
2015-08-15 15:56:41 -04:00
Charles Chan
693321afeb
Cleanup "Working with containers" page.
...
* Cleanup introduction
* Update output of `docker version`
* Cleanup explaination of `docker inspect`
* Change 'deleting' to 'removing' for consistency
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 2fcae333e840ee513702cebed0b6a41e8915263c
Component: engine
2015-08-15 08:44:56 -07:00
Dharmit Shah
ee022d610e
Fixing docs to remove references to links under terms/
...
Removed terms/ directory
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Upstream-commit: 0a925d07a8f87a8333ded429da656a711fd06214
Component: engine
2015-08-15 13:09:29 +05:30
Don Kjer
470c87b117
Adding support to publish on custom host port ranges
...
Signed-off-by: Don Kjer <don.kjer@gmail.com >
Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
Upstream-commit: 47272f9cc563ea90d1f86df044f5429d15a37e4f
Component: engine
2015-08-15 02:41:29 +00:00
moxiegirl
6d118e9c38
Merge pull request #15428 from charleswhchan/patch-1
...
Improve/fix "Dockerizing Applications" page.
Upstream-commit: aedd45346a19f9d06ebeec9ca7117a104e0c23c1
Component: engine
2015-08-14 14:03:11 -07:00
Sebastiaan van Stijn
b867f2e185
Merge pull request #15542 from MHBauer/rundoclink
...
fix link
Upstream-commit: d1585f1d6610c36d3d0ba93421ed605d9fd9931d
Component: engine
2015-08-14 20:35:51 +02:00
moxiegirl
6c82403d31
Merge pull request #15574 from diogomonica/fixing-race-on-key-backup
...
Fixing race condition on private key backup how-to
Upstream-commit: 424702b91ac31a5caaad0a2c97693db87170d40f
Component: engine
2015-08-14 11:26:56 -07:00
Phil Estes
2ad32c4a2a
Correct readability of --userland-proxy para
...
Was reading this to explain it to someone and noticed the missing "s"
which makes it not so great for nice English readability..
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 4e53e80934f1813ff3e66d69fc931ed59707ffc6
Component: engine
2015-08-13 23:56:42 -04:00
Diogo Monica
f65a61ad5d
Fixing race condition on private key backup how-to
...
Signed-off-by: Diogo Monica <diogo@docker.com >
Upstream-commit: fbb268c12ab12fa282f11eabdedf7fdee3d24b4a
Component: engine
2015-08-13 19:16:00 -07:00
Sebastiaan van Stijn
f1cc5568e9
Merge pull request #13501 from vdemeester/8048-image-repository-tag
...
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
2015-08-13 21:36:21 +02:00
Sebastiaan van Stijn
6c6e94b0e5
Merge pull request #15560 from docker/patch-bad-formatting
...
Fixing bad formatting reported by David via email
Upstream-commit: 599b76000d64cd4771410513812fe3560467f82b
Component: engine
2015-08-13 20:26:05 +02:00
Sebastiaan van Stijn
2a1429c0c6
Merge pull request #15451 from liubin/liubin/fix-broken-link
...
fix broken link to wiki
Upstream-commit: 6b1b1ad31cc0b0433ec33743488b40d8f1919894
Component: engine
2015-08-13 17:03:41 +02:00
bin liu
a65c38b101
fix broken link to glossary page.
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: f6753cd9635b294f1463ef7fb6952dd2a74c0a69
Component: engine
2015-08-13 22:40:20 +08:00
moxiegirl
13929d0935
Fixing bad formatting reported by David via email
...
Fixed and tested
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ef453f7118d704319768d8d9c0cfe79e2d521afa
Component: engine
2015-08-13 06:42:26 -07:00
Hu Keping
155dc9b901
Docs: some fix about notarysandbox
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 79aac6584de8c5cd1797933f20b6d9b1c2fa33e9
Component: engine
2015-08-13 16:53:05 +08:00
Vincent Demeester
d024131050
Fix #8048 : make docker images repository:tag work
...
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.
Closes #8048 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
2015-08-13 08:50:09 +02:00
Tim Dettrick
273be038ad
Updated test to check for exec --privileged side-effects
...
Also improving documentation for same feature as part of
docker/docker#14113 docs review.
Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au >
Upstream-commit: 90326939c8089dbd7b59423415bc67cae6208b08
Component: engine
2015-08-13 16:37:20 +10:00
Tim Dettrick
337be087f4
Revert "Revert "Add docker exec run a command in privileged mode""
...
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.
Original commit (for which this is effectively a rebased version) is
72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang
<leijitang@huawei.com >.
Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au >
Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600
Component: engine
2015-08-13 16:36:44 +10:00
Kai Blin
f5a22c8edc
reference/run: Add some articles
...
Signed-off-by: Kai Blin <kai@samba.org >
Upstream-commit: 8a61e2b151c9b8ed985c9d508fb4f31c84c155f7
Component: engine
2015-08-13 06:35:48 +02:00
Kai Blin
243657de54
reference/run: Add a paragraph break
...
Signed-off-by: Kai Blin <kai@samba.org >
Upstream-commit: 4d89910820e4c0fb62e1e496e5df837b77514f27
Component: engine
2015-08-13 06:34:57 +02:00
moxiegirl
2c3fdeb15a
Merge pull request #15541 from thaJeztah/hashtag-space
...
docs: fix fedora prerequisites heading
Upstream-commit: 650feb29f10bc2775877579c67534646949610f2
Component: engine
2015-08-12 19:33:38 -07:00
Morgan Bauer
363f39db73
fix link
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: c50e78e799a3e66306d6376c60337d38de1bd59a
Component: engine
2015-08-12 17:20:20 -07:00
David Calavera
534bcd14d8
Merge pull request #15449 from albers/completion-help
...
Remove -h flag from completion and daemon reference
Upstream-commit: d50881e446c4f230099e41124fda481849e82222
Component: engine
2015-08-12 17:09:51 -07:00
Sebastiaan van Stijn
8998990826
docs: fix fedora prerequisites heading
...
Fixes the prerequisites heading not being
rendered properly, because of a missing space.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2c18e1cd053895cd1ef28ec940d4be7f94c97604
Component: engine
2015-08-13 01:29:10 +02:00
moxiegirl
8aaf7ef170
Merge pull request #15450 from liubin/liubin/change-port-number-through-example
...
change port number through example context
Upstream-commit: 8a0efadee14769f39abb0b3c67a2c794dc973443
Component: engine
2015-08-12 09:49:50 -07:00
Mary Anthony
a3fa37d61e
Fixes after release
...
Adding in a link about the deprecated material
Fixing bad link to staging
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 8b09f8a302eaf7d73015112a774010e57e7f2c25
Component: engine
2015-08-11 23:13:14 -07:00
Kai Blin
f6c797da8f
reference/run: Clarify the use of numeric UIDs
...
it is possible to pass an UID that has not been created inside the container, clarify this in the docs.
This should fix issue #14795
Signed-off-by: Kai Blin <kai@samba.org >
Upstream-commit: a7cfb098d48b9b9ce19bc57fd2c219981b24b75b
Component: engine
2015-08-12 06:34:37 +02:00
Harald Albers
f68b6c3486
Remove -h flag from completion and daemon reference
...
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.
`-h` is not included in the help messages of the commands, though.
It ist visible in
* reference: only in `docker daemon` reference,
see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
see output of `grep -RF '**-h**' man`
For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ceb11d966034f4b4308abf4fc2826b4c840b6e99
Component: engine
2015-08-11 07:30:58 -07:00
moxiegirl
10cc4f16e2
Merge pull request #15458 from moxiegirl/remove-registry-v1-14616
...
Removing references to registry 1.0
Upstream-commit: c4cb55b84f052c1e5d88860128a1117b696af332
Component: engine
2015-08-10 17:44:32 -07:00