cbc404a083
Merge pull request #22785 from runcom/fix-flaky-network
...
TestPsGroupPortRange: allocate less ports
2016-05-18 11:08:10 +02:00
14b5a50f0a
Merge pull request #22582 from aboch/vnd
...
Vendoring libnetwork b66c038
2016-05-18 10:55:28 +02:00
28a436af36
Merge pull request #22768 from mansinahar/run-cmd-doc
...
Update 'run' command doc for better readability. Issue:#22721
2016-05-17 17:06:12 +02:00
713b9541f5
Merge pull request #22788 from thaJeztah/fix-typo-in-completion
...
Fix typo in zsh completion
2016-05-17 08:26:25 -05:00
09cb57b773
Fix typo in zsh completion
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-17 13:38:46 +02:00
bdb354f19b
TestPsGroupPortRange: allocate less ports
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-17 12:23:37 +02:00
6eb2b903a3
Docker changes for libnetwork vendoring b66c038
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
1f9e3815aa
Vendoring libnetwork b66c0385f30c6aa27b2957ed1072682c19a0b0b4
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
ebcf785f2f
Update libnetwork dependencies for b66c038
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
4c6838137c
Merge pull request #22728 from Microsoft/jstarks/improve_import
...
Windows: reexec during layer import
2016-05-16 11:08:05 -07:00
01c9b968bd
Update 'run' command doc for better readability
...
Signed-off-by: Mansi Nahar <mansi.nahar@macbookpro-mansinahar.local>
2016-05-16 12:49:18 -04:00
0088b8fbbe
Merge pull request #22561 from cpuguy83/delay_start_for_discovery
...
Wait for discovery on container start error
2016-05-16 09:57:19 -04:00
16e6211cf7
Merge pull request #22761 from hqhq/hq_check_config_kmem
...
Update check_config for MEMCG_KMEM
2016-05-16 12:38:21 +02:00
37dfd8bc8c
Merge pull request #22757 from gondor/master
...
Documentation: Updated URL to plugin reference - docker-volume-netshare
2016-05-16 08:39:31 +02:00
27d7b135d4
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>
2016-05-16 13:55:24 +08:00
7b3dc03b66
update URL for docker-volume-netshare
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
2016-05-15 21:20:54 -07:00
6e12d0720f
Merge pull request #22751 from igrcic/docs-small-typo-reference-attach
...
remove double "using" in reference attach docs
2016-05-16 01:22:43 +02:00
0884dca124
remove double "using" in reference attach docs
...
Signed-off-by: Ivan Grcic <igrcic@gmail.com>
2016-05-15 23:18:01 +02:00
1bcc42e038
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
2016-05-15 05:47:09 +02:00
1391e75d45
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>
2016-05-14 17:30:19 -07:00
e333675cd7
Merge pull request #22743 from yongtang/05142016-typo-in-work-with-networks
...
Fix a typo in work-with-networks.md
2016-05-15 02:15:45 +02:00
414b9dea8a
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>
2016-05-14 16:58:18 -07:00
fbf3741f0d
Merge pull request #22740 from sdurrheimer/zsh-completion-network-ls-filter-label
...
Add zsh completion for 'docker network ls --filter label'
2016-05-14 22:27:00 +02:00
c80f926997
Merge pull request #22739 from sdurrheimer/zsh-completion-daemon-concurrent
...
Add zsh completion for 'docker daemon --max-concurrent-downloads --ma…
2016-05-14 22:25:59 +02:00
14348e9cca
Merge pull request #22738 from sdurrheimer/zsh-completion-logs-details
...
Add zsh completion for 'docker logs --details'
2016-05-14 22:25:05 +02:00
afca8a454a
Add zsh completion for 'docker network ls --filter label'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:38:39 +02:00
bf9a1d5027
Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:20:20 +02:00
dcca0f6dd1
Add zsh completion for 'docker logs --details'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:13:01 +02:00
89bb4d96e4
Merge pull request #22737 from tkopczynski/typo-imagesandcontainers
...
Small fix in images and containers docs
2016-05-14 17:57:45 +02:00
d0ab1c360f
Small fix in images and containers docs
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-14 16:09:49 +02:00
aa197f147d
Merge pull request #22735 from yongtang/22463-22590-emit-docker-daemon-reload-event
...
Vendor engine-api to allow docker daemon reload event
2016-05-14 11:49:01 +02:00
2f94a367d7
Merge pull request #22720 from thaJeztah/fix-markdown
...
Fix Markdown formatting in Devicemapper docs
2016-05-14 10:12:15 +02:00
d365c0e151
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>
2016-05-13 20:39:35 -07:00
0f57f47ac3
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>
2016-05-13 20:39:24 -07:00
b3bc5e0fe4
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>
2016-05-13 18:16:11 -07:00
3723b88406
Merge pull request #22727 from clawconduce/master
...
Fix error for env variables example in docker reference
2016-05-14 01:00:55 +02:00
6d40104f11
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>
2016-05-13 11:53:14 -07:00
2af7c5cfe2
Fix error for env variables example in docker reference
...
Signed-off-by: Charles Law <claw@conduce.com>
2016-05-13 10:55:36 -07:00
5154856586
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>
2016-05-13 15:41:45 +02:00
a213a446d7
Merge pull request #22714 from albers/completion-logs--details
...
bash completion for `docker logs --details`
2016-05-13 14:37:45 +02:00
c4dd432fd4
Merge pull request #22713 from albers/completion-daemon-concurrent
...
bash completion for `docker daemon --max-concurrent-{down,up}load`
2016-05-13 14:36:14 +02:00
29fe2f34d2
Merge pull request #22588 from runcom/fix-authz-tests
...
pkg: authorization: cleanup tests
2016-05-13 10:29:45 +02:00
d166c8fbb2
bash completion for `docker logs --details`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-13 08:42:43 +02:00
cc6bcaaddc
bash completion for `docker daemon --max-concurrent-{down,up}load`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-13 08:25:53 +02:00
9de21de453
Merge pull request #22462 from Microsoft/jjh/22181unittests
...
Windows: Reduce CLI time, move some to unit tests
2016-05-13 00:27:29 +02:00
cf783266ff
Merge pull request #22279 from WeiZhang555/wait-channel
...
Remove WaitRunning
2016-05-12 14:56:55 -07:00
e811e9784f
Merge pull request #22544 from Microsoft/jjh/terminate
...
Windows: Terminate on failed shutdown, fixes dockerd deadlock
2016-05-12 14:46:56 -07:00
95872b65fb
Merge pull request #22636 from sean-jc/fix-oom-killer-tests
...
Add the swapMemorySupport requirement to OOM tests
2016-05-12 14:41:55 -07:00
c95f1fcbd9
Merge pull request #22679 from cyli/bump-notary-version
...
Bump notary version up to 0.3.0 and re-vendor.
2016-05-12 14:38:07 -07:00
ab090291dd
Merge pull request #22707 from TimWolla/patch-1
...
User network does not work with IPv6
2016-05-12 23:27:57 +02:00
Vincent Demeester
Brian Goff
Sebastiaan van Stijn
Antonio Murdaca
Alessandro Boch
John Howard
mansinahar
Tibor Vass
Antonio Murdaca
Qiang Huang
Jeremy Unruh
Sebastiaan van Stijn
Ivan Grcic
Yong Tang
Steve Durrheimer
Tomasz Kopczynski
John Starks
Charles Law
Harald Albers
Alexander Morozov