Brian Goff
259365d60a
Add DOCKER_BUILD_GOGC to tweak GOGC for compile
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9672afa3391119b3b06d87735041168b01b7f1da
Component: engine
2016-01-27 13:35:26 -05:00
Jess Frazelle
0da34ddb69
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
Upstream-commit: c39c7e6edf7d432730a84fa549b74203954b54c4
Component: engine
2016-01-27 09:36:26 -08:00
Jess Frazelle
0f96a7bb9f
Merge pull request #19784 from vdemeester/oh-tools-it
...
Fix TOOLS.md jenkins plugin link :)
Upstream-commit: 6b2c1ed4c0921834311244d2c23e91f670c22084
Component: engine
2016-01-27 09:34:29 -08:00
Brian Goff
7383a82de4
Merge pull request #19071 from icecrime/incremental_builds
...
Enable incremental builds
Upstream-commit: ae14e6cc0ab24b57e7a6873ece7263bb6cc6aa44
Component: engine
2016-01-27 11:21:01 -05:00
Vincent Demeester
e30b51b22f
Fix TOOLS.md jenkins plugin link :)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 85449137548f98e2af9b06818183b2b60d51d9f0
Component: engine
2016-01-27 16:33:20 +01:00
Brian Goff
efdc7448da
Merge pull request #19779 from sillyousu/19777-fix-volume-store-dereference-deadlock
...
fix dead lock in volume store dereference
Upstream-commit: c17d4b4ebb7f15b4fcb32d191ea3306d13f15d06
Component: engine
2016-01-27 09:28:11 -05:00
Antonio Murdaca
7835159bd3
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
Upstream-commit: c1b168664f3b0d92164f1a4308ad6c653d38cf40
Component: engine
2016-01-27 14:08:28 +01:00
Vincent Demeester
25d2566b85
Merge pull request #19778 from albers/completion-volume-ls-dangling
...
Improve bash completion for `docker volume ls -f dangling`
Upstream-commit: 38424b73d91b8d5774115dee0e083c4d3957623c
Component: engine
2016-01-27 09:54:24 +01:00
Pei Su
debd24d25b
fix dead lock in volume store dereference
...
Signed-off-by: Pei Su <sillyousu@gmail.com >
Upstream-commit: f5310652d30e72fe88a3edc70b2911397c28b7e4
Component: engine
2016-01-27 16:34:10 +08:00
Harald Albers
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
David Calavera
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
Arnaud Porterie
50846c5d05
Enable incremental builds
...
Remove the `-a` build flag and introduce `-i` in order to reuse
previously compiled dependencies.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 1445e4db32e648277470513213473021ca59010a
Component: engine
2016-01-26 21:24:44 -08:00
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
380ad90e75
Windows CI: PortTestInspectApi*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3c61f006162f2781651dda764dddcf4af4957846
Component: engine
2016-01-26 20:23:40 -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
cyli
142063ee1c
Update integration tests with new error messages, and to use different repos per test.
...
This way we won't encounter any problems with one test using cached data from a different
test.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 0617521ba2ce160899852bb707c15bae7309f18a
Component: engine
2016-01-26 18:02:00 -08:00
cyli
65cf98bf38
Re-vendor notary, as well as change jfrazelle/go to docker/go.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 8fd2c8791d9c7cf0dd28b77565f0a04349a8c9a2
Component: engine
2016-01-26 18:02:00 -08:00
Lei Jitang
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
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
Jessica Frazelle
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
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
Jessica Frazelle
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
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