b2643b6953
Docs: Label clarification
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-25 11:48:07 -07:00
60abc96acf
Merge pull request #22943 from vdemeester/21769-fix-detach-keys
...
Fix escape-keys by preserving input if invalid
2016-05-25 09:53:53 -07:00
004ce6b571
Merge pull request #22916 from duglin/FixNetTest
...
Fix flaky TestApiStatsNetworkStats test
2016-05-25 18:51:47 +02:00
c7ee503082
Merge pull request #22958 from Microsoft/hcs_rpc
...
Windows: Use the new HCS RPC API
2016-05-25 09:25:22 -07:00
8c70ab803c
Merge pull request #22953 from Microsoft/jjh/TestRunWorkingDirectory
...
Windows: Fix TestRunWorkingDirectory
2016-05-25 17:54:39 +02:00
53e2deb159
Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace
...
Fix a race in pkg/integration.TestChannelBufferTimeout
2016-05-25 11:35:23 -04:00
4d376e9cc2
Merge pull request #22960 from justincormack/seccompdefnotarm
...
Do not run the seccomp tests that use default.json on non x86 architectures
2016-05-25 17:20:16 +02:00
a41e823c1b
Merge pull request #22969 from AkihiroSuda/fix22963LogRace
...
Fix a race in daemon/logger.TestCopier
2016-05-25 11:09:51 -04:00
cef4ea0b97
Merge pull request #22966 from AkihiroSuda/fix22964MemRace
...
Fix a race in pkg/discovery/memory
2016-05-25 10:58:31 -04:00
5bd6067b85
Merge pull request #22968 from mbentley/fix-dm-docs
...
Fixed lost thin pool devicemapper docs
2016-05-25 16:40:52 +02:00
0b8ea4387a
Re-apply changes made in 24ec73f
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-05-25 08:46:39 -04:00
79205c3f06
Fix thin pool devicemapper docs overwritten
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-05-25 08:45:51 -04:00
2a4b4a8133
Merge pull request #22962 from normalfaults/b
...
fixed spelling error in windows.go
2016-05-25 12:21:08 +02:00
cd159fba85
Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix
...
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
2016-05-25 10:19:41 +02:00
5383824e08
Merge pull request #22974 from albers/completion-ps-filters
...
bash completion for `docker ps -f {before,since}`
2016-05-25 16:05:04 +08:00
522698dd43
Merge pull request #22967 from srinsriv/master
...
Update dind
2016-05-25 09:55:10 +02:00
c49d327406
bash completion for `docker ps -f {before,since}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-25 09:35:33 +02:00
9f5a2c6e33
Merge pull request #22408 from yongtang/21976-allow-dns-and-net-host
...
The option --dns and --net=host should not be mutually exclusive.
2016-05-25 09:11:26 +02:00
d0d828e292
Fix a race in pkg/integration.TestChannelBufferTimeout
...
Update #22965
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-25 07:09:38 +00:00
ab533f0651
Fix a race in daemon/logger.TestCopier
...
Update #22963
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-25 05:07:24 +00:00
1f8fbbc0d8
Fix a race in pkg/discovery/memory
...
Fix #22964
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-25 04:01:43 +00:00
27afaf3774
Update dind
...
Typo
Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com>
2016-05-24 20:42:28 -07:00
90bd41a74d
The option --add-host and --net=host should not be mutually exclusive.
...
This fix tries to address the issue raised in #21976 and allows
the options of `--add-host` and `--net=host` to work at the same time.
The documentation has been updated and additional tests have been
added to cover this change.
This fix fixes #21976 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-24 18:49:11 -07:00
59bb86a964
Merge branch 'master' into b
2016-05-24 21:43:45 -04:00
f91acbaee4
fixed spelling error in docker cli run test
...
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
2016-05-24 21:43:22 -04:00
36a9151b27
fixed spelling error in windows.go
...
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
2016-05-24 21:40:08 -04:00
75385dc216
Do not run the seccomp tests that use default.json on non x86 architectures
...
The generated profile that we check in is for amd64 and i386 architectures
and does not work correctly on arm as it is missing required syscalls,
and also specifies the architectures that are supported. It works on
ppc64le at the moment but better to skip the test as it is likely to
break in future.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-24 17:47:30 -07:00
959c1a52bf
Change Docker to use the new HCS RPC API
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-05-24 16:36:51 -07:00
23821fe586
The option --dns, --dns-search, --dns-opt and --net=host should not be mutually exclusive.
...
This fix tries to address the issue raised in #21976 and allows
the options of `--dns`, `--dns-search`, `--dns-opt` and `--net=host`
to work at the same time.
The documentation has been updated and additional tests have been
added to cover this change.
This fix fixes #21976 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-24 16:03:26 -07:00
257494bd0a
Windows: Fix TestRunWorkingDirectory
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-24 15:13:06 -07:00
29dbcbad87
Merge pull request #22925 from jstarks/fix_integration_test
...
pkg/integration: Port tests to Windows
2016-05-24 17:31:43 -04:00
7832e2ae82
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
...
Fixes the test by loading in the architecture specific busybox
image when the test daemon starts.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-05-24 16:33:49 -04:00
bdc06cf8f8
Merge pull request #22922 from justincormack/ppc64le-seccomp
...
Enable seccomp on ppc64le
2016-05-24 16:08:50 -04:00
0802401d22
Merge pull request #22948 from dmcgowan/remove-unused-overlay-mounted
...
Remove unused mounted function in overlay
2016-05-24 13:08:06 -07:00
86a7632d63
Merge pull request #22091 from amitkris/build_solaris
...
Get the Docker Engine to build clean on Solaris
2016-05-24 21:41:36 +02:00
8fc825364a
pkg/integration: Port tests to Windows
...
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-05-24 12:12:48 -07:00
48a53d2e8c
Merge pull request #22935 from thaJeztah/add-justin-to-maintainers
...
Add Justin Cormack to maintainers
2016-05-24 20:23:52 +02:00
5cc0824730
Remove unused mounted function in overlay
...
The mount check is now done by the FSChecker. This function is no longer needed and shouldn't be called.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-05-24 11:02:07 -07:00
38217d4353
Merge pull request #22932 from chenchun/fix_build
...
Fix building image error if bridge network is disabled
2016-05-24 10:33:34 -07:00
f0d6fd93a2
Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md
...
Fix incorrectly named "ip-mask" and "api-cors-headers" options
2016-05-24 18:21:52 +02:00
f10a222de1
Merge pull request #22941 from AkihiroSuda/fix22940
...
Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
2016-05-24 18:13:44 +02:00
7faa2a40bc
Merge pull request #22264 from aaronlehmann/updated-image-spec
...
Update image specification for content-addressability changes
2016-05-24 18:06:52 +02:00
1dc87a6f9f
Merge pull request #22945 from albers/completion-daemon-events
...
bash completion for daemon events
2016-05-24 17:30:18 +02:00
cc6a1b8bb3
bash completion for daemon events
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-24 17:19:03 +02:00
0fb6190243
Fix escape-keys by preserving input if invalid
...
Currently, using a custom detach key with an invalid sequence, eats a
part of the sequence, making it weird and difficult to enter some key
sequence.
This fixes by keeping the input read when trying to see if it's the key
sequence or not, and "writing" then is the key sequence is not the right
one, preserving the initial input.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-24 17:14:48 +02:00
ce07eac570
Merge pull request #22906 from nshalman/patch-1
...
Clarification about 'docker build --build-arg'
2016-05-24 15:33:27 +02:00
fd7d99ed28
Clarification about 'docker build --build-arg'
...
See #22860
Signed-off-by: Nahum Shalman <nshalman@omniti.com>
2016-05-24 09:25:11 -04:00
6a385a0022
Merge pull request #22900 from AkihiroSuda/fix22020
...
update docs/reference/commandline/cp.md
2016-05-24 14:06:02 +02:00
1670914b8a
Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
...
Fix #22940
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-24 11:29:55 +00:00
cb1635c9cf
update docs/reference/commandline/cp.md
...
Close #22020
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-24 11:09:38 +00:00
John Howard
David Calavera
Vincent Demeester
John Howard
Sebastiaan van Stijn
Brian Goff
Matt Bentley
Lei Jitang
Harald Albers
Akihiro Suda
srinsriv
Yong Tang
Nirmal Mehta
Justin Cormack
Darren Stahl
Christopher Jones
Phil Estes
Michael Crosby
John Starks
Derek McGowan
Alexander Morozov
Nahum Shalman