612ad97231
Add support for --pid=container:<id>
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: fb43ef649bc6aa11ca19c0e046518e85e1c7e2fa
Component: engine
2016-05-17 13:49:05 -04:00
f38f115e61
Merge pull request #22768 from mansinahar/run-cmd-doc
...
Update 'run' command doc for better readability. Issue:#22721
Upstream-commit: 28a436af3641f202287f98e326537a10897da9fa
Component: engine
2016-05-17 17:06:12 +02:00
052290c835
Fix typo in zsh completion
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 09cb57b773d1b83773120da3c4382defa37cf257
Component: engine
2016-05-17 13:38:46 +02:00
f4ab66e327
Merge pull request #22728 from Microsoft/jstarks/improve_import
...
Windows: reexec during layer import
Upstream-commit: 4c6838137c10e322ce2bd64ce6db0df652e14267
Component: engine
2016-05-16 11:08:05 -07:00
a8dfbf45a8
Update 'run' command doc for better readability
...
Signed-off-by: Mansi Nahar <mansi.nahar@macbookpro-mansinahar.local >
Upstream-commit: 01c9b968bdec8ba1202eacc5ec5c7edb361db6ce
Component: engine
2016-05-16 12:49:18 -04:00
30fc6309f3
Merge pull request #22561 from cpuguy83/delay_start_for_discovery
...
Wait for discovery on container start error
Upstream-commit: 0088b8fbbea9ca360f8a57cb63c7adc50b4613b0
Component: engine
2016-05-16 09:57:19 -04:00
860cdd60f1
Merge pull request #22761 from hqhq/hq_check_config_kmem
...
Update check_config for MEMCG_KMEM
Upstream-commit: 16e6211cf7ffcdaae11e4ded61d0e15b52c1c8a4
Component: engine
2016-05-16 12:38:21 +02:00
00eb665726
Update check_config for MEMCG_KMEM
...
CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default
since 4.6, so it's merged to CONFIG_MEMCG.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 27d7b135d4475b8c7b5159792b9b6d160e4535c1
Component: engine
2016-05-16 13:55:24 +08:00
ebf20baa9c
update URL for docker-volume-netshare
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: 7b3dc03b663df7f8812057e9e524026d49568432
Component: engine
2016-05-15 21:20:54 -07:00
e0797b6f12
remove double "using" in reference attach docs
...
Signed-off-by: Ivan Grcic <igrcic@gmail.com >
Upstream-commit: 0884dca124beac751964256234b3b3d4e402b21a
Component: engine
2016-05-15 23:18:01 +02:00
6d28e0d9be
Merge pull request #22742 from yongtang/05142016-update-deprecated-docs-for-LXC-built-in-exec-driver
...
Update deprecated docs for LXC built-in exec driver
Upstream-commit: 1bcc42e0386814abdef491afa605ece79cc081d4
Component: engine
2016-05-15 05:47:09 +02:00
06085eef27
Update deprecated docs for LXC built-in exec driver
...
The LXC built-in exec driver has been deprecated in 1.8 and
further removed in 1.10, yet in deprecated.md it still shows:
```
Target For Removal In Release: v1.10
```
This fix changes the above to `Removed In Release:`.
In addition, lxc-conf flag and API fields have already been
removed in 1.10 as well so the related description has also been
updated in this fix.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1391e75d451c8e9c51b8cd29d90e6043e59f0f04
Component: engine
2016-05-14 17:30:19 -07:00
fb7a3051cb
Fix a typo in work-with-networks.md
...
This fix fixes a typo in the documentation of `work-with-networks.md`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 414b9dea8a1bf7ef7a4b9584dd887c51b49751d4
Component: engine
2016-05-14 16:58:18 -07:00
4c4ce8206c
Merge pull request #22740 from sdurrheimer/zsh-completion-network-ls-filter-label
...
Add zsh completion for 'docker network ls --filter label'
Upstream-commit: fbf3741f0d2d6328c9351c38120e6e46cdce5fdf
Component: engine
2016-05-14 22:27:00 +02:00
b8c6540ccd
Merge pull request #22739 from sdurrheimer/zsh-completion-daemon-concurrent
...
Add zsh completion for 'docker daemon --max-concurrent-downloads --ma…
Upstream-commit: c80f9269975114e7587a49e2b54f4a9ef8c27a43
Component: engine
2016-05-14 22:25:59 +02:00
ca207f3050
Add zsh completion for 'docker network ls --filter label'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: afca8a454ac4214461b106d26d610231df7804f3
Component: engine
2016-05-14 19:38:39 +02:00
92808ac20a
Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: bf9a1d5027d4f7d6a5e07d2774c3499d41d63c28
Component: engine
2016-05-14 19:20:20 +02:00
ebdd31bd5a
Add zsh completion for 'docker logs --details'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: dcca0f6dd1b2fb239c0310112a5968c2f3a51aca
Component: engine
2016-05-14 19:13:01 +02:00
1263382883
Small fix in images and containers docs
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: d0ab1c360f5af7b92ab3f414e42ad817e0bd3059
Component: engine
2016-05-14 16:09:49 +02:00
1295cacba8
Merge pull request #22735 from yongtang/22463-22590-emit-docker-daemon-reload-event
...
Vendor engine-api to allow docker daemon reload event
Upstream-commit: aa197f147d7c984887c637607b268bdbbc4f00a2
Component: engine
2016-05-14 11:49:01 +02:00
1e3ad76193
Merge pull request #22720 from thaJeztah/fix-markdown
...
Fix Markdown formatting in Devicemapper docs
Upstream-commit: 2f94a367d7dcb24141cbe48c4e75e3671ae3e0f1
Component: engine
2016-05-14 10:12:15 +02:00
f219f50ad7
Fix failed test for TestRestartPolicy
...
This commit is a follow up of the last commit:
Vendor engine-api to allow docker daemon reload event.
After vendor/engine-api has been updated, the following
unit test fails:
```
--- FAIL: TestRestartPolicy (0.00s)
hostconfig_test.go:177: RestartPolicy.IsNone for { 0} should have been false but was true
```
The reason for the above failed unit test is that pull request:
https://github.com/docker/engine-api/pull/200
updated behavior of the restart policy and makes restartpolicy.IsNone
return true if restart policy name is `""`. As a result, the above
mentioned unit test fails.
This fix fixes the inconsistency of the unit test so that `TestRestartPolicy`
could pass again.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: d365c0e151aa39de88575cf9e182c51e33cb2c47
Component: engine
2016-05-13 20:39:35 -07:00
2fd3a4b570
Vendor engine-api to allow docker daemon reload event.
...
This fix updated the vendored engine-api to version
e374c4fb5b121a8fd4295ec5eb91a8068c6304f4, which defines a new event
type of `DaemonEventType`. The purpose is to allow emitting`
`daemon reload` event as is raised in #22463 .
This fix is related to #22463 and #22590 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0f57f47ac39209a7337d0fdcd1217b6f656e971b
Component: engine
2016-05-13 20:39:24 -07:00
0d93e91ad8
Windows: reexec when importing layers
...
This improves reliability by doing parsing of potentially untrusted data
in a separate process. It opens the door for further security improvements
if we can lock down the reexec-ed process. It also improves import
performance by only taking the backup and restore privileges once, for the
whole process.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: b3bc5e0fe4c62b1c0193fc19777b22636368b551
Component: engine
2016-05-13 18:16:11 -07:00
e37f7c6e68
Windows: revendor go-winio
...
This fixes a variety of small bugs in layer handling and adds a new API
for acquiring privileges for the whole process.
Fixes #22404 (but only for new images -- existing images will need to be
re-pushed).
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 6d40104f116abdf9740c60846320ce6d36f03edd
Component: engine
2016-05-13 11:53:14 -07:00
6d47664a6b
Fix error for env variables example in docker reference
...
Signed-off-by: Charles Law <claw@conduce.com >
Upstream-commit: 2af7c5cfe24b4c8e931f751979b5e69e20ba77e2
Component: engine
2016-05-13 10:55:36 -07:00
fb0e9a9733
Fix Markdown formatting in Devicemapper docs
...
Fixes some text being presented as "code".
Also reformatted/wrapped some text and examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5154856586eb0f81e7c3935448ed163c60b1a24d
Component: engine
2016-05-13 15:41:45 +02:00
9fe611523f
Merge pull request #22714 from albers/completion-logs--details
...
bash completion for `docker logs --details`
Upstream-commit: a213a446d7828c54e9ce104b38e1adfd4827871e
Component: engine
2016-05-13 14:37:45 +02:00
4a0f966eca
Merge pull request #22713 from albers/completion-daemon-concurrent
...
bash completion for `docker daemon --max-concurrent-{down,up}load`
Upstream-commit: c4dd432fd4b0fe6feb51575a1ede8a59b43b97d9
Component: engine
2016-05-13 14:36:14 +02:00
66fb0a371f
Merge pull request #22588 from runcom/fix-authz-tests
...
pkg: authorization: cleanup tests
Upstream-commit: 29fe2f34d2d882ee998545aa9ba120ab251ffc61
Component: engine
2016-05-13 10:29:45 +02:00
921a4bba50
bash completion for docker logs --details
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d166c8fbb21ce5ba2e456ca2b737202182dfe7f8
Component: engine
2016-05-13 08:42:43 +02:00
91f1115a66
bash completion for docker daemon --max-concurrent-{down,up}load
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: cc6bcaaddcc590bd4810bcc0177ab3c3b43d5a37
Component: engine
2016-05-13 08:25:53 +02:00
e033d6beca
Merge pull request #22462 from Microsoft/jjh/22181unittests
...
Windows: Reduce CLI time, move some to unit tests
Upstream-commit: 9de21de4531e01169d903751ab48a29457769610
Component: engine
2016-05-13 00:27:29 +02:00
6a16ddef16
Merge pull request #22279 from WeiZhang555/wait-channel
...
Remove WaitRunning
Upstream-commit: cf783266ff314a236d3635e86a43d89677ac99ad
Component: engine
2016-05-12 14:56:55 -07:00
e7146eaec9
Merge pull request #22544 from Microsoft/jjh/terminate
...
Windows: Terminate on failed shutdown, fixes dockerd deadlock
Upstream-commit: e811e9784fd95069e9d5e14960e04cb0499ccd1d
Component: engine
2016-05-12 14:46:56 -07:00
b511f6b16d
Merge pull request #22636 from sean-jc/fix-oom-killer-tests
...
Add the swapMemorySupport requirement to OOM tests
Upstream-commit: 95872b65fb65bcc275b2fa141b6a991ee085a41a
Component: engine
2016-05-12 14:41:55 -07:00
687f64e55c
Merge pull request #22679 from cyli/bump-notary-version
...
Bump notary version up to 0.3.0 and re-vendor.
Upstream-commit: c95f1fcbd9d6acc02c9af5fd62d21921b0150cd2
Component: engine
2016-05-12 14:38:07 -07:00
cc4806d5b5
Clarify that --ip does not work with IPv6 in docker run
...
Closes docker/docker#22707
Signed-off-by: Tim Düsterhus <tim@bastelstu.be >
Upstream-commit: f6ecba104556f4c68b8ad11ee8c2e6b2a27b87ff
Component: engine
2016-05-12 23:19:46 +02:00
7995f3c6bb
Merge pull request #22683 from npcode/docs-no-request-status
...
docs: Remove RequestStatusCode
Upstream-commit: 2ae863c28fdae1da9794942c90efa9f217bccd83
Component: engine
2016-05-12 21:29:45 +02:00
2aeee33813
Merge pull request #22630 from thaJeztah/refactor-overlay-compatibility
...
refactor overlay storage driver compatibility check
Upstream-commit: 150009e9d8dbde08d15e0a72c1022f867860f57e
Component: engine
2016-05-12 12:00:57 -07:00
4b65a9405b
Merge pull request #22698 from cpuguy83/22612_fix_map_access
...
Fix concurrent map access in bytespipe
Upstream-commit: 350832acfa2f90bd4d3c280dce02843761d6f876
Component: engine
2016-05-12 11:51:54 -07:00
5ca095f66f
Merge pull request #22333 from thaJeztah/update-label-description
...
RFC: Add "process" labels
Upstream-commit: b5094fbd2dee6c2db99be5d4a7a7194e1c81b133
Component: engine
2016-05-12 11:39:14 -07:00
3af8464259
Merge pull request #22445 from yongtang/20936-22443-concurrent-connection
...
Docker pull/push with max concurrency limits.
Upstream-commit: e9117578a7837eda31d690d5e51d09d43a6a8fca
Component: engine
2016-05-12 08:51:28 -07:00
fbe4a4ca43
Fix concurrent map access in bytespipe
...
When getting and returning a buffer, need to make sure to syncronize
access to the pools map.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 194c72611d5053f1e05dd020d02989dec872a06b
Component: engine
2016-05-12 10:04:05 -04:00
5b0da6166c
Merge pull request #22694 from allencloud/fix-typos-in-docs
...
docs: correct some typos
Upstream-commit: 475c37dd66ce4b2f3994ac61a4494950e43873b9
Component: engine
2016-05-12 14:35:39 +02:00
a6e840fdce
Merge pull request #22687 from haoshuwei/fix-docs-securitymd
...
Fixing security.md
Upstream-commit: edf5e097a2ee1e1b90a6634d6fa6cf1547dff65c
Component: engine
2016-05-12 14:35:21 +02:00
58545d95ec
Merge pull request #22620 from yongtang/05092016-remove-deprecated-driver-specific-log-tags
...
Remove deprecated driver specific log tags
Upstream-commit: 7fd9f9964aa110b22b68c45be6148aa298abeb5c
Component: engine
2016-05-12 13:20:07 +02:00
abeea999e4
fix typos in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 57e2a82355c15005875fedc733dc45081af5a2d9
Component: engine
2016-05-12 18:38:02 +08:00
ad24086538
Merge pull request #22682 from hqhq/hq_update_check
...
Update go-check
Upstream-commit: ec2b0c08890a57a0d4e5ed9991bfc845b39b706d
Component: engine
2016-05-12 12:09:36 +02:00
c143020222
docs: update menu order in security section
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 067e54eeacf691c49cc169b80acd814c62a504d0
Component: engine
2016-05-12 11:19:53 +02:00
Mrunal Patel
Vincent Demeester
Sebastiaan van Stijn
John Howard
mansinahar
Tibor Vass
Antonio Murdaca
Qiang Huang
Jeremy Unruh
Ivan Grcic
Yong Tang
Sebastiaan van Stijn
Steve Durrheimer
Tomasz Kopczynski
John Starks
Charles Law
Harald Albers
Alexander Morozov
Tim Düsterhus
Arnaud Porterie
Brian Goff
allencloud