385c7ab306
Merge pull request #23000 from jstarks/use_image_version_for_console_check
...
Windows: Use image version, not OS version for TTY fixup
Upstream-commit: 089166ebe29c1801483965b0e30b41fda53b1ec2
Component: engine
2016-05-25 17:40:56 -07:00
2b4f5fa2df
Merge pull request #22951 from Microsoft/jjh/ise2
...
Windows: run -it not crash in PowerShell ISE
Upstream-commit: e010610828456fcb9ccce46723894c4dff238daf
Component: engine
2016-05-25 16:50:06 -07:00
ce0de1f301
Fix URLs for official Oracle installation guide.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 7711c842be52cd753c13a50594da301f2158ddae
Component: engine
2016-05-26 07:40:01 +10:00
0dfa27aea9
update link to hub plans
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3d782cdbffd4b8bddbc8f63e3a0b762224a5d3c3
Component: engine
2016-05-25 23:01:13 +02:00
5a1641d4f8
Merge pull request #22956 from Microsoft/jjh/nonttylogin
...
Fix bad error doing docker login in from non TTY
Upstream-commit: ff3dc489668ca634e48f4e0a971bfd23e80699ff
Component: engine
2016-05-25 16:45:48 -04:00
b1b78eb8c6
Merge pull request #22949 from vdemeester/move-daemon-container-horn
...
Move some container related methods and structs to smaller files
Upstream-commit: d9db8960fda02769264ce0b553adf2b427c1c48a
Component: engine
2016-05-25 13:42:07 -07:00
2e38fa40d5
Merge pull request #22985 from samuelkarp/awslogs-logging-driver
...
awslogs: Fix a race in mockcwlogsclient
Upstream-commit: dca92044beaada248c4bab07c1bb9d38be1cf5aa
Component: engine
2016-05-25 13:08:00 -07:00
37e80ffc41
Windows: Use image version, not OS version for TTY fixup
...
A previous change added a TTY fixup for stdin on older Windows versions to
work around a Windows issue with backspace/delete behavior. This change
used the OS version to determine whether to activate the behavior.
However, the Windows bug is actually in the image, not the OS, so it
should have used the image's OS version.
This ensures that a Server TP5 container running on Windows 10 will have
reasonable console behavior.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 6508c015fe764fd59438cabffcbc6102c9cf04ef
Component: engine
2016-05-25 12:22:52 -07:00
9d83880bc6
Merge pull request #22986 from SvenDowideit/add-make-test
...
Add make test and other small cleanups
Upstream-commit: 4746864c2b405bcb2526df20d572b9de9df7f3b1
Component: engine
2016-05-25 21:03:59 +02:00
5eadce41df
Merge pull request #22987 from Microsoft/jjh/labeldocs
...
Docs: Label clarification
Upstream-commit: bb80563a8123824bed23c36698e6fa01317bbe5f
Component: engine
2016-05-25 20:56:54 +02:00
8c21a32e0f
awslogs: Fix a race in mockcwlogsclient
...
Signed-off-by: Samuel Karp <skarp@amazon.com >
Upstream-commit: c1ad02ccc8791b3c517aa37223d27792863cbf17
Component: engine
2016-05-25 11:50:22 -07:00
6679d6d042
Merge pull request #22661 from SvenDowideit/update-compatibility-matrix
...
docs: update graphdriver compatibility matrix
Upstream-commit: a5e4aaaf71cad9e4f57b50d92297d74c515b6c6d
Component: engine
2016-05-25 20:48:39 +02:00
1031d8bb5e
Docs: Label clarification
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b2643b6953e59549eba8af51a7e783a3e4cebc46
Component: engine
2016-05-25 11:48:07 -07:00
7098114aac
docs: update graphdriver compatibility matrix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a7bf4e4832c216bdbc9fc678262bcd2c081e914b
Component: engine
2016-05-25 18:33:45 +00:00
abd6ce8179
Add make test and other small cleanups
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ad538f6465776281550a7e40b59d5eb6f706b777
Component: engine
2016-05-25 18:30:01 +00:00
0635a7e10b
Merge pull request #22908 from vdemeester/7967-since-before-image-filters
...
Add before and since filter to images
Upstream-commit: 0fe4417a3b2c18714303f319224b74ec08674115
Component: engine
2016-05-25 20:15:23 +02:00
e94aa3f2ac
Merge pull request #22943 from vdemeester/21769-fix-detach-keys
...
Fix escape-keys by preserving input if invalid
Upstream-commit: 60abc96acfeae1985f4f0e9e9b44376b75a235f0
Component: engine
2016-05-25 09:53:53 -07:00
ac5e68234e
Merge pull request #22916 from duglin/FixNetTest
...
Fix flaky TestApiStatsNetworkStats test
Upstream-commit: 004ce6b57124c1a99348e1447ac9e00a970d1b34
Component: engine
2016-05-25 18:51:47 +02:00
3f005ffe52
Windows: run -it not crash in ISE
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 486a1a03d86a679740d79c2ef5e2a9574342f8c3
Component: engine
2016-05-25 09:50:18 -07:00
5773cc71d1
Error login from non TTY
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 541fba13fcbef5e082e3ce08a14901edce4697b6
Component: engine
2016-05-25 09:29:50 -07:00
ecdb255cd3
Merge pull request #22958 from Microsoft/hcs_rpc
...
Windows: Use the new HCS RPC API
Upstream-commit: c7ee50308290d56b70933dfd83bd70e3a9df93d5
Component: engine
2016-05-25 09:25:22 -07:00
504a2ff9e3
Merge pull request #22953 from Microsoft/jjh/TestRunWorkingDirectory
...
Windows: Fix TestRunWorkingDirectory
Upstream-commit: 8c70ab803c49816de8124703db6635e9c5c7ce25
Component: engine
2016-05-25 17:54:39 +02:00
558c1d058e
Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace
...
Fix a race in pkg/integration.TestChannelBufferTimeout
Upstream-commit: 53e2deb1590c8d0b6bf7c700c630dc432ea772d4
Component: engine
2016-05-25 11:35:23 -04:00
6eea85e6f1
Merge pull request #22960 from justincormack/seccompdefnotarm
...
Do not run the seccomp tests that use default.json on non x86 architectures
Upstream-commit: 4d376e9cc265c098c7faf03d0e75c1164cbf24e0
Component: engine
2016-05-25 17:20:16 +02:00
ddcc4a0981
Merge pull request #22969 from AkihiroSuda/fix22963LogRace
...
Fix a race in daemon/logger.TestCopier
Upstream-commit: a41e823c1bcbaafca1081dd23a7af3fa25ac946f
Component: engine
2016-05-25 11:09:51 -04:00
38a1e359da
Merge pull request #22966 from AkihiroSuda/fix22964MemRace
...
Fix a race in pkg/discovery/memory
Upstream-commit: cef4ea0b9759386800aae27d6fa92c80d4465745
Component: engine
2016-05-25 10:58:31 -04:00
e0c1ae90e0
Merge pull request #22968 from mbentley/fix-dm-docs
...
Fixed lost thin pool devicemapper docs
Upstream-commit: 5bd6067b85cdaa80cfbd43648f9b0a57e1cf58b9
Component: engine
2016-05-25 16:40:52 +02:00
e79985ff9b
Re-apply changes made in 24ec73f
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com >
Upstream-commit: 0b8ea4387a3b1e415a49b9c6dbead858891a5ce9
Component: engine
2016-05-25 08:46:39 -04:00
0f6a9d4e70
Fix thin pool devicemapper docs overwritten
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com >
Upstream-commit: 79205c3f061c4b690a459cb2b08b6a7df7af327c
Component: engine
2016-05-25 08:45:51 -04:00
9fc37c22c9
Add before and since filter to images
...
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.
$ docker images --filter before=myimage
# display all images older than myimage
$ docker images --filter since=myimage
# display all images younger than myimage
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 750e16f57c0121aa8cdad1763f0bb6e54b8c6d75
Component: engine
2016-05-25 13:49:10 +02:00
3e8a3ed291
Merge pull request #22962 from normalfaults/b
...
fixed spelling error in windows.go
Upstream-commit: 2a4b4a813342294a6191425caba471a94c8a39f6
Component: engine
2016-05-25 12:21:08 +02:00
5912cc64b5
Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix
...
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
Upstream-commit: cd159fba8529efe70ea634842a024560dbfd3aec
Component: engine
2016-05-25 10:19:41 +02:00
d11b12b133
Merge pull request #22974 from albers/completion-ps-filters
...
bash completion for `docker ps -f {before,since}`
Upstream-commit: 5383824e08a58aa83c6ac018706569345fa9e3ea
Component: engine
2016-05-25 16:05:04 +08:00
a953a5531b
Merge pull request #22967 from srinsriv/master
...
Update dind
Upstream-commit: 522698dd43e1f55b3df8a83b6b11f107a519ab84
Component: engine
2016-05-25 09:55:10 +02:00
0de35f39e7
bash completion for docker ps -f {before,since}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c49d3274067055dc830d97f1490a84aa73e403e6
Component: engine
2016-05-25 09:35:33 +02:00
a4084df811
Fix a race in pkg/integration.TestChannelBufferTimeout
...
Update #22965
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: d0d828e292733fa1d5e2d09d7f184be69129e757
Component: engine
2016-05-25 07:09:38 +00:00
1c46623429
Fix a race in daemon/logger.TestCopier
...
Update #22963
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: ab533f06510a14a023c056604f9520741073acd3
Component: engine
2016-05-25 05:07:24 +00:00
3b8abc6850
Fix a race in pkg/discovery/memory
...
Fix #22964
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 1f8fbbc0d830ad9a887d04a25152ea344688903b
Component: engine
2016-05-25 04:01:43 +00:00
966dbfdb11
Update dind
...
Typo
Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com >
Upstream-commit: 27afaf3774d7f46028ab72192d4c1b65f8d88b87
Component: engine
2016-05-24 20:42:28 -07:00
b520646fdd
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 >
Upstream-commit: 90bd41a74d57080711678bffa2bc4371020ee3a5
Component: engine
2016-05-24 18:49:11 -07:00
b39fa693a7
Merge branch 'master' into b
...
Upstream-commit: 59bb86a964c38d0f2cc724c686803472bb48968b
Component: engine
2016-05-24 21:43:45 -04:00
3d16c1ca14
fixed spelling error in docker cli run test
...
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com >
Upstream-commit: f91acbaee452191f406d31e3f3fd44210aa17fbf
Component: engine
2016-05-24 21:43:22 -04:00
b5619754dc
fixed spelling error in windows.go
...
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com >
Upstream-commit: 36a9151b27168076073770142d0b354f0e83fdb2
Component: engine
2016-05-24 21:40:08 -04:00
4d6727d7fe
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 >
Upstream-commit: 75385dc216e784d24535326376352de03eaeb059
Component: engine
2016-05-24 17:47:30 -07:00
d8cc018311
Change Docker to use the new HCS RPC API
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 959c1a52bf11dd6b3e65f10bbaa867bfabba6838
Component: engine
2016-05-24 16:36:51 -07:00
e230ff1485
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 >
Upstream-commit: 23821fe5867427fa36c265bc994b1a2c3cf9b21f
Component: engine
2016-05-24 16:03:26 -07:00
f99c99aaac
Windows: Fix TestRunWorkingDirectory
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 257494bd0a017cad264609f1a77b9af3ab7f991c
Component: engine
2016-05-24 15:13:06 -07:00
6373766983
Merge pull request #22925 from jstarks/fix_integration_test
...
pkg/integration: Port tests to Windows
Upstream-commit: 29dbcbad878483d9239d6a432c85620aced895c4
Component: engine
2016-05-24 17:31:43 -04:00
2e5b933fb0
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 >
Upstream-commit: 7832e2ae82ae56e9719c6930b054f643285a79b3
Component: engine
2016-05-24 16:33:49 -04:00
2453234b4d
Merge pull request #22922 from justincormack/ppc64le-seccomp
...
Enable seccomp on ppc64le
Upstream-commit: bdc06cf8f8f4868186e3a843482afed48361cc09
Component: engine
2016-05-24 16:08:50 -04:00
