Commit Graph
21730 Commits
Author SHA1 Message Date
Arnaud Porterie 134ec5337e Merge pull request #19765 from Microsoft/jjh/ibrokewindowsci
Darn it, I broke CI due to multiple declarations
Upstream-commit: d789618ea4d99d5c9d0183d0375cee22f4fcc9f2
Component: engine
2016-01-26 21:05:34 -08:00
John Howard 2f92225c3a Windows CI: Darn it, I broke due to multiple declarations
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 916b9db71d6de8db8731a6d881079a7a8e61eb64
Component: engine
2016-01-26 19:58:53 -08:00
Lei Jitang 4c547f393d Merge pull request #19722 from WeiZhang555/exec-restarting
Forbid exec a restarting container
Upstream-commit: 0ae94303b89a9648f26b599617a9d78ee5284a4c
Component: engine
2016-01-27 11:43:43 +08:00
Sebastiaan van Stijn f913d7db9f Merge pull request #19612 from Microsoft/jjh/apicontainerstest
Windows CI: Fixup docker_api_containers_test.go
Upstream-commit: 3cf4884787b6543dd325cd9f66be7338f2b9997e
Component: engine
2016-01-26 19:14:43 -08:00
Arnaud Porterie d39dd64150 Merge pull request #19744 from Microsoft/jjh/testhistory
Windows CI: Enable TestHistory* cli tests
Upstream-commit: 603c04a789832652ef141f14bea82f66f974a910
Component: engine
2016-01-26 19:08:33 -08:00
Arnaud Porterie bd0e0077d9 Merge pull request #19605 from Microsoft/jjh/docker_api_images_test
Windows CI: Porting for docker_api_images_test.go
Upstream-commit: 864cca2287f7605a2b973e9bad7e4c4330f5662e
Component: engine
2016-01-26 19:04:25 -08:00
Arnaud Porterie 7377fa761c Merge pull request #19604 from Microsoft/jjh/testrename
Windows CI: Fix TestRename*
Upstream-commit: 70c5e96cb8bd6b826006f73102135bf74e2fa877
Component: engine
2016-01-26 19:03:31 -08:00
Arnaud Porterie e1fbe13aaa Merge pull request #19603 from Microsoft/jjh/testps
Windows CI: Address simple failures in TestPS*
Upstream-commit: 51d4d8eff214ce1ec97d652f00cc70e822e6aba7
Component: engine
2016-01-26 19:01:17 -08:00
Doug Davis 8e0d35beb6 Merge pull request #19742 from Microsoft/jjh/testrmi
Windows CI: Port TestRmi tests
Upstream-commit: 9b82174f93e90e7b24146df823a07cde6df60891
Component: engine
2016-01-26 21:46:35 -05:00
Zhang Wei 1083d494cd Forbid exec a restarting container
Currently if we exec a restarting container, client will fail silently,
and daemon will print error that container can't be found which is not a
very meaningful prompt to user.

This commit will stop user from exec a restarting container and gives
more explicit error message.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 1d2208fed90da9ab72ded3b1c65bb2a71b66ce93
Component: engine
2016-01-27 10:05:06 +08:00
Tibor Vass a374e9a1d6 Merge pull request #19737 from calavera/fix_reload_docs
Remove cluster storage advertise from reload.
Upstream-commit: 7992b353c04b4214c28d5be6195b2703a52defb1
Component: engine
2016-01-26 17:04:46 -08:00
Arnaud Porterie 25f186f583 Merge pull request #19688 from crosbymichael/tmpfs-tar
Remove tar copy-up for tmpfs mounts
Upstream-commit: 3a70ab3a2c78ab40a5fdfe55be5745753eb41139
Component: engine
2016-01-26 17:03:07 -08:00
Tibor Vass 75b4488b94 Merge pull request #19751 from crosbymichael/update-libcontainer-jan26
Update libcontainer to 3d8a20bb772defc28c355534d83
Upstream-commit: 3eaf878999553cebc5b77e5f835f017793991b9a
Component: engine
2016-01-26 16:57:49 -08:00
Sebastiaan van Stijn c43fa88487 Merge pull request #19621 from moxiegirl/new-navigation
New navigation for 1.10
Upstream-commit: eb729a0cb0be1f2d2ba5c616fcd4e585289f6dfc
Component: engine
2016-01-26 16:06:29 -08:00
Mary Anthony e734434f58 Creating Engine specific menu
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
2016-01-26 15:58:53 -08:00
Sebastiaan van Stijn aee6396d2e Merge pull request #19743 from aaronlehmann/http-idle-timeouts
Set idle timeouts for HTTP reads and writes in communications with a registry
Upstream-commit: e23ea05e113ea5069f8bea3e75046b9429ca2e75
Component: engine
2016-01-26 15:39:52 -08:00
Sebastiaan van Stijn 272aadc7e6 Merge pull request #19150 from mikedougherty/cs-108-rpm-release
[CS-108] Adjust version string processing for RPM build
Upstream-commit: 4bcb6c7fc8758ad390a634a270cda66a8c98c9f3
Component: engine
2016-01-26 15:22:14 -08:00
David Calavera 2a5a8c6749 Remove cluster storage advertise from reload.
Because libnetwork won't really send container information to the new
storage anyways.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: fa163f5619bb01cabca1c214b59e14518a797a7a
Component: engine
2016-01-26 18:19:30 -05:00
Michael Crosby a7727691d8 Update libcontainer to 3d8a20bb772defc28c355534d83
Fixes #14203

This bump fixes the issue of having the container's pipes connection
reset by peer because of using the json.Encoder and having a \n added to
the output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7b5896702bd2951541af27925620172edb5d3505
Component: engine
2016-01-26 15:00:07 -08:00
Jess Frazelle 53e94abeab Merge pull request #19730 from jfrazelle/update-tools-urls
update tools urls and remove things we dont use
Upstream-commit: 03864c1db07fff1db08becca1ec4e9bb4b49ecd2
Component: engine
2016-01-26 14:36:28 -08:00
Tibor Vass fb47eab7c8 Merge pull request #19738 from mrjana/mh
Vendoring libnetwork v0.6.0-rc5
Upstream-commit: 0e4eda16913eda3d892b6025b00539b72535d274
Component: engine
2016-01-26 14:14:39 -08:00
Brian Goff 92c9319930 Merge pull request #19671 from calavera/volume-dangling
Make volume dangling filter return only used volumes with `dangling=false`.
Upstream-commit: 146e49b039c59107cc31de734f0bf5d4604c04d9
Component: engine
2016-01-26 17:01:20 -05:00
Michael Crosby 0bed041a45 Move tar copy-up for tmpfs mounts
We cannot rely on the tar command for this type of operation because tar
versions, flags, and functionality can very from distro to distro.
Since this is in the container execution path it is not safe to have
this as a dependency from dockers POV where the user cannot change the
fact that docker is adding these pre and post mount commands.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ae8ec4860e68e945cf6b2c157fa4e243c35c54a5
Component: engine
2016-01-26 14:00:39 -08:00
Brian Goff 597af2a851 Merge pull request #19704 from cpuguy83/speedup_build_cache
Use imageStore.Children instead of whole the Map
Upstream-commit: b775efc9bc5a1dcbcd473150ecec4646af51e272
Component: engine
2016-01-26 16:59:55 -05:00
Antonio Murdaca 0c72855bb7 Merge pull request #19734 from Microsoft/jjh/testtag
Windows CI: Port TestTag* cli tests
Upstream-commit: 0b248e88ffa20f6537dff2c4f013c5a33ffe7656
Component: engine
2016-01-26 22:56:36 +01:00
Sebastiaan van Stijn 6e22d2e841 Merge pull request #19745 from cpuguy83/19625_docs_for_mount_prop_with_systemd
Add note about mount propagation on systemd
Upstream-commit: d648a100c9e84ce6ac3b77b2d65a5ed8a712bd29
Component: engine
2016-01-26 13:51:22 -08:00
Brian Goff 08577a13fd Add note about mount propagation on systemd
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7d7b2044b76a7f3a332f3c9bdb17dd8b4e66ee22
Component: engine
2016-01-26 16:48:45 -05:00
Tibor Vass 5c9f48b079 Merge pull request #19723 from bboreham/not-preferred
Stop referring to requested IP address as "preferred"
Upstream-commit: 4adb0fb310737061c5a8f7d7264139daa4fb07e1
Component: engine
2016-01-26 13:46:09 -08:00
Arnaud Porterie 282971bd64 Merge pull request #19569 from aidanhs/aphs-fix-options-api
Permit OPTIONS request against any url, fixes #19398
Upstream-commit: fd5013e4fa18e895abd33da714189dbeb0cbf576
Component: engine
2016-01-26 13:39:51 -08:00
Tibor Vass 26b759d185 Merge pull request #19731 from albers/completion-daemon--userns-remap
bash completion for `docker daemon --userns-remap`
Upstream-commit: 1584e63b9e926b963fe88e22b40d4c04107050de
Component: engine
2016-01-26 13:14:56 -08:00
John Howard 24442de326 Windows CI: Enable TestHistory* cli tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 15c32f39a94bb389087389e03ae4e2429dc851a0
Component: engine
2016-01-26 12:42:09 -08:00
Aaron Lehmann 665c7f7ff1 Set idle timeouts for HTTP reads and writes in communications with the registry
Otherwise, some operations can get stuck indefinitely when the remote
side is unresponsive.

Fixes #12823

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 84b2162c1a15256ac09396ad0d75686ea468f40c
Component: engine
2016-01-26 12:40:39 -08:00
John Howard b6a52ab8d2 Windows CI: Port TestRmi tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 94e5fab5ed04a6cd47a4aa74024f79c75aadca03
Component: engine
2016-01-26 12:22:37 -08:00
Mike Dougherty f352b24e50 Adjust version string processing for RPM build
This will only trim off the last '-' separated token to be checked for
RC status. This allows including a 'cs#' token in the version string.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 04100233679124a2d0b6c622cec81954f3aaf38d
Component: engine
2016-01-26 11:49:59 -08:00
Jana Radhakrishnan bed434b1dc Vendoring libnetwork v0.6.0-rc5
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 730a6d2fc22f9efdb18a79b39935f1438a5e5f84
Component: engine
2016-01-26 11:44:43 -08:00
David Calavera 71c71e17c6 Fix bash completion for docker volume ls --dangling=false.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9e2b63e0aeec264a65c9684fe825e857c3e272d6
Component: engine
2016-01-26 14:29:37 -05:00
Brian Goff b200f85ceb Use imageStore.Children instead of whole the Map
daemon cache was getting the whole image map and then iterating through
it to find children. This information is already stored in the image
store.

Prior to this change building the docker repo with a full cache took 30
seconds.
After it takes between 15 seconds or less (As low as 9 seconds).
This is an improvement on docker 1.9.1 which hovered around 17 seconds.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1350e8b7b8025d73056b800963c001fb9619a85c
Component: engine
2016-01-26 14:12:56 -05:00
John Howard c572fa49af Windows CI: Port TestTag* cli tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1723c6477f93c2cdb57212c188c7121211bba82b
Component: engine
2016-01-26 10:41:31 -08:00
Jess Frazelle aa78ebdfe7 Merge pull request #19013 from hqhq/add_support_docker_aarch64
Add support for build and test docker on arm64
Upstream-commit: b5420be597ea9ce6a0ea7f544a141711289cd3da
Component: engine
2016-01-26 10:33:48 -08:00
Harald Albers 682d79bd90 bash completion for docker daemon --userns-remap
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 62f366490b87457e1fb52a09405691cc18787a2e
Component: engine
2016-01-26 10:24:47 -08:00
Jessica Frazelle b999875432 update tools urls and remove things we dont use
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8ea5051e78375b9dce7e8cd442d3e263b3b1eb02
Component: engine
2016-01-26 10:15:47 -08:00
Jess Frazelle 57013f74fa Merge pull request #19712 from runcom/test-requires-apparmor
integration-cli: require Apparmor
Upstream-commit: c56e309d05a121a509716f887ebc9df065a8fd18
Component: engine
2016-01-26 09:18:29 -08:00
Arnaud Porterie eed5e0f1c7 Merge pull request #19705 from mavenugo/18222
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
Upstream-commit: 269a6d7d3656fe7edf7cb630125ee4664dd24c78
Component: engine
2016-01-26 09:16:57 -08:00
Arnaud Porterie 12928bbe9c Merge pull request #19490 from cyphar/remove-dockerinit
Remove dockerinit once and for all
Upstream-commit: 7a97e938e2229fa7a50b0f6e66c70eddcb9d2dc2
Component: engine
2016-01-26 08:27:35 -08:00
Bryan Boreham fa73e1295e Stop referring to requested IP address as "preferred",
since it is an error if that address is unavailable.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 7126ecd0ad1f6188540949cbdbca20f4a75d1839
Component: engine
2016-01-26 15:13:26 +00:00
Doug Davis fc9234dc9d Merge pull request #19715 from coolljt0725/fix_test_daemon
Test utils: fix daemon start utils
Upstream-commit: fc8e3442976c189cfc770ca2dcedbf68cd8a9a1b
Component: engine
2016-01-26 10:08:50 -05:00
Doug Davis 286b4c8bf1 Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie
Optimize `TestEventsContainerFailStartDie`
Upstream-commit: e5b5c0ebe80a3f65f8583ffe31eb692686965fef
Component: engine
2016-01-26 09:32:52 -05:00
Aleksa Sarai 7bc1dfc4e5 vendor: update engine-api
This removes all references to InitPath and InitSha1, as well as pulling
in a few other minor engine-api fixes.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 71c63aa72e3788af27fef0de9005cde6c7728a2b
Component: engine
2016-01-27 00:34:31 +11:00
Lei Jitang 31ed090a9a Test utils: fix daemon start utils
User call `Start` could with args, and the args could
contains `--storage-driver`, but in `Start`, it will add
`--storage-driver` even though user has specified `--storage-driver`
in args.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: e88258ca2ef0047973168a29fd9ec27669582c0e
Component: engine
2016-01-26 08:31:50 -05:00
Aleksa Sarai 924f35dee7 *: remove documentation references to dockerinit
While the documentation is very patchy on dockerinit, remove all
references in packaging documentation to the now purged dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: e72192be404c9a8489191d43fd6e5c429081d5c8
Component: engine
2016-01-26 23:47:02 +11:00