aaf90d6259
Merge pull request #14570 from vdemeester/13365-ps-image-filter
...
Add docker ps ancestor filter for image
Upstream-commit: b1cb1b1df493b3e0b739b9f374b6c82e306dede8
Component: engine
2015-08-28 19:47:43 +02:00
5950954f43
Merge pull request #15023 from hqhq/hq_add_status_in_inspect
...
Add status string to State field for inspect
Upstream-commit: 6caaa8a63544c052d757aecee93d3488b7b3d9e2
Component: engine
2015-08-28 08:27:36 -07:00
56ea150002
Merge pull request #15778 from dharmit/13595-update-docs-process-interaction-container
...
Added note about process interaction with container in detached mode
Upstream-commit: fdc73cc3fc3166c2c78d70653c117f1573d47096
Component: engine
2015-08-27 22:39:20 +02:00
b3c7b9f038
Merge pull request #15822 from vdemeester/docs-update-filtering-ps-and-images
...
Update filtering chapters on ps/images references
Upstream-commit: 04b0fb631441b9dda4e9cb1a38b255bac65aa4e7
Component: engine
2015-08-27 10:39:20 -07:00
59e5fcdd6a
Update filtering chapters on ps/images references
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61de442c49a56f9fc6f82174c97e1229e8aa39f2
Component: engine
2015-08-27 08:47:03 +02:00
2133f70561
Added note about process interaction with container in detached mode
...
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Upstream-commit: 9f8891a855c81d49bced308b9bc90640af0c5f01
Component: engine
2015-08-27 09:39:34 +05:30
e191a06015
Add 'ancestor' ps filter for image
...
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c1af0ac0820d1385fe2ee65593b0558840395c7b
Component: engine
2015-08-26 22:59:48 +02:00
c09d503a17
Merge pull request #15826 from Microsoft/start-from-one
...
Builder counts from 1
Upstream-commit: 7a74422724ef3a4ae33f6bcd45ce908be279e476
Component: engine
2015-08-26 13:59:38 -07:00
2dc587d949
Merge pull request #15843 from MHBauer/version-order
...
reweight api doc for v1.21 to correct the order.
Upstream-commit: ea65c38ac0972709cdb371ce6b1886eb252a126e
Component: engine
2015-08-26 13:51:06 -07:00
ebcab8fd5d
reweight api doc for v1.21 to correct the order.
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 31a52a31c661fedc671e53c3706bc294f8bf6b1c
Component: engine
2015-08-26 13:40:37 -07:00
bfe1bbc7d2
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3b7eb2723461b1eb4be692f4bced0ae8ea9cb58
Component: engine
2015-08-26 13:37:52 -04:00
5850f3450f
Builder counts from 1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 17d6c6c7e514d6cea0820c6e81924413e9416cad
Component: engine
2015-08-26 10:05:04 -07:00
6dd2b74345
Merge pull request #15711 from monitorjbl/import-commit-message
...
adding message option to the import subcommand
Upstream-commit: b857dadb334fe0660abce4ae73a8b5b5c7f92c33
Component: engine
2015-08-26 11:42:10 +02:00
5e196ef2cc
Fix json examples in the api reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7296c845b739ae4133e3d02d56cb7e8df29eb020
Component: engine
2015-08-25 10:55:12 -04:00
cb83c53d63
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
Upstream-commit: cefb72080d8d30a2f53ac6c7ae91d58e42210661
Component: engine
2015-08-24 23:02:44 -04:00
15378abfc2
adding message option to the import subcommand
...
Signed-off-by: Taylor Jones <monitorjbl@gmail.com >
Upstream-commit: 936b2c6afe490b562df4ebea854b116c3b40a9f5
Component: engine
2015-08-25 02:55:04 +00:00
83ec490c79
Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
...
Add always-unless-stopped restart policy
Upstream-commit: fd8b25c802780683cc5776e6d3aaca9536e7370b
Component: engine
2015-08-24 13:48:56 -04:00
26bf545a48
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
Upstream-commit: 9bd8a9b66bb493026599d22c7637909cb460d039
Component: engine
2015-08-21 14:34:27 -07:00
042270cda3
specify the docker run --rm action
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 76a559ccb288632ca650abe704a48581365f1ab4
Component: engine
2015-08-21 08:52:06 +08:00
1a9ed3e5c0
Add gists provided by Mary
...
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 35cbcc2fc1334b14a6aa9a1adf432c0ee80fd108
Component: engine
2015-08-20 00:30:39 +02:00
9faf4cef96
run.md: --expose does NOT override Dockerfile EXPOSE
...
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.
This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.
Signed-off-by: Spencer Brown <spencer@spencerbrown.org >
Upstream-commit: 6dd84ba2ab6416a71e58ca32263c6f51a197aed0
Component: engine
2015-08-19 23:57:35 +02:00
9b9c1c02b7
Merge pull request #15682 from MHBauer/cliorder
...
add weight to daemon page so it renders in order
Upstream-commit: 286afb9a77e6851de310336c6065bd2870520414
Component: engine
2015-08-19 14:24:51 -07:00
3148f0c9e1
add weight to daemon page so it renders in order
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 2a841573521cc9d62d7b3f06143334890662cd54
Component: engine
2015-08-19 10:26:19 -07:00
6655987940
Merge pull request #15694 from liubin/fixtypo
...
add missing instruction
Upstream-commit: f848f34da222ebabc5eccf066aad3c89eeb6fd77
Component: engine
2015-08-19 19:05:41 +02:00
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
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
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
1a4eeac4c4
add missing instruction
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 1988064ef2abe5273fbcc8910b0177ad2b85bd54
Component: engine
2015-08-19 18:43:19 +08:00
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
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
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
2bf42179ec
Add unless-stopped restart policy
...
Fixes #11008
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 10305dc5e8cc7e2e1560ce2abe93c17e923a1c47
Component: engine
2015-08-18 11:39:06 -07:00
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
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
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
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
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
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
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
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
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
b867f2e185
Merge pull request #15542 from MHBauer/rundoclink
...
fix link
Upstream-commit: d1585f1d6610c36d3d0ba93421ed605d9fd9931d
Component: engine
2015-08-14 20:35:51 +02:00
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
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
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
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
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
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
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
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
