8977875ac5
Add tag support to journald logging driver, closes #19556
...
Signed-off-by: Ivan Babrou <ibobrik@gmail.com >
Upstream-commit: 5a3351883b254d3690e9dcc5b89293bcee474493
Component: engine
2016-01-27 10:52:19 +00:00
42e15b6834
Improve bash completion for docker volume ls -f dangling
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a381efcf39ef7f82b1496a4bbaf42df096d91bc5
Component: engine
2016-01-27 09:32:14 +01:00
46738c170b
Merge pull request #19736 from albers/completion-network-rm-custom
...
Let bash completion for `docker network rm` only complete custom networks
Upstream-commit: 805a107df4c43e5fd20dce7d716001290d7b2840
Component: engine
2016-01-27 09:07:47 +01:00
d35ce892f0
Merge pull request #19759 from thaJeztah/docs-for-19688
...
Fix docs for tmpfs (pr 19688)
Upstream-commit: ab8da94531ba77feee1931923be812354fbd2b2c
Component: engine
2016-01-27 00:05:38 -08:00
3bba97b9dd
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 386392f79987a135fd9168cc92482f92c671713c
Component: engine
2016-01-26 23:52:14 -08:00
253f58ccf7
Merge pull request #19754 from jfrazelle/revised-release-docs
...
updates to release checklist
Upstream-commit: 857093fbcaf8929e24bc42689c3fe337d2c34dcf
Component: engine
2016-01-26 23:32:18 -08:00
f8277f71b6
Merge pull request #19753 from jfrazelle/repo-docs
...
add docs for package repo maintenance
Upstream-commit: 872b927c765943be7237b4b6c9c2d6e6850045eb
Component: engine
2016-01-26 23:30:21 -08:00
ee42d601b2
Merge pull request #19717 from coolljt0725/fix_load
...
Daemon: do GetRWLayer after checking if container support the current graph driver
Upstream-commit: 63f8429bf0152bf0e8903ab4def18295bd6d4e1d
Component: engine
2016-01-26 21:55:32 -08:00
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
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
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
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
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
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
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
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
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
c0b7e34886
Daemon: do GetRWLayer after checking if container use the current graph driver
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 899f1b18707d035a1dca73cae0dd7b3bfe65c046
Component: engine
2016-01-26 20:20:30 -05:00
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
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
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
0c609873d1
updates to release checklist
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6807582cdce133afe84e408a5692f8598a3d6685
Component: engine
2016-01-26 16:20:23 -08:00
e4397d2914
add docs for package repo maintenance
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d0cb7e599ed63fb6a29080d929ff7e7620a1fc1f
Component: engine
2016-01-26 15:59:08 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
dcca310e82
Let bash completion for docker network rm only complete custom networks
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0e1bfdd43eeebe02402e9b1bb4ef995084c13676
Component: engine
2016-01-26 10:57:38 -08:00
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
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
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
Ivan Babrou
Harald Albers
Vincent Demeester
Sebastiaan van Stijn
Sebastiaan van Stijn
David Calavera
John Howard
Lei Jitang
Arnaud Porterie
Doug Davis
Zhang Wei
Tibor Vass
Jessica Frazelle
Mary Anthony
Michael Crosby
Jess Frazelle
Brian Goff
Antonio Murdaca
Aaron Lehmann
Mike Dougherty
Jana Radhakrishnan