Jess Frazelle
c39c7e6edf
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
2016-01-27 09:36:26 -08:00
Jess Frazelle
6b2c1ed4c0
Merge pull request #19784 from vdemeester/oh-tools-it
...
Fix TOOLS.md jenkins plugin link :)
2016-01-27 09:34:29 -08:00
Brian Goff
ae14e6cc0a
Merge pull request #19071 from icecrime/incremental_builds
...
Enable incremental builds
2016-01-27 11:21:01 -05:00
Vincent Demeester
8544913754
Fix TOOLS.md jenkins plugin link :)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-27 16:33:20 +01:00
Brian Goff
c17d4b4ebb
Merge pull request #19779 from sillyousu/19777-fix-volume-store-dereference-deadlock
...
fix dead lock in volume store dereference
2016-01-27 09:28:11 -05:00
Antonio Murdaca
c1b168664f
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
2016-01-27 14:08:28 +01:00
Vincent Demeester
38424b73d9
Merge pull request #19778 from albers/completion-volume-ls-dangling
...
Improve bash completion for `docker volume ls -f dangling`
2016-01-27 09:54:24 +01:00
Pei Su
f5310652d3
fix dead lock in volume store dereference
...
Signed-off-by: Pei Su <sillyousu@gmail.com>
2016-01-27 16:34:10 +08:00
Harald Albers
a381efcf39
Improve bash completion for `docker volume ls -f dangling`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-27 09:32:14 +01:00
Vincent Demeester
805a107df4
Merge pull request #19736 from albers/completion-network-rm-custom
...
Let bash completion for `docker network rm` only complete custom networks
2016-01-27 09:07:47 +01:00
Sebastiaan van Stijn
ab8da94531
Merge pull request #19759 from thaJeztah/docs-for-19688
...
Fix docs for tmpfs (pr 19688)
2016-01-27 00:05:38 -08:00
Sebastiaan van Stijn
386392f799
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-26 23:52:14 -08:00
Sebastiaan van Stijn
857093fbca
Merge pull request #19754 from jfrazelle/revised-release-docs
...
updates to release checklist
2016-01-26 23:32:18 -08:00
Sebastiaan van Stijn
872b927c76
Merge pull request #19753 from jfrazelle/repo-docs
...
add docs for package repo maintenance
2016-01-26 23:30:21 -08:00
David Calavera
63f8429bf0
Merge pull request #19717 from coolljt0725/fix_load
...
Daemon: do GetRWLayer after checking if container support the current graph driver
2016-01-26 21:55:32 -08:00
Arnaud Porterie
1445e4db32
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>
2016-01-26 21:24:44 -08:00
Arnaud Porterie
d789618ea4
Merge pull request #19765 from Microsoft/jjh/ibrokewindowsci
...
Darn it, I broke CI due to multiple declarations
2016-01-26 21:05:34 -08:00
John Howard
3c61f00616
Windows CI: PortTestInspectApi*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 20:23:40 -08:00
John Howard
916b9db71d
Windows CI: Darn it, I broke due to multiple declarations
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 19:58:53 -08:00
Lei Jitang
0ae94303b8
Merge pull request #19722 from WeiZhang555/exec-restarting
...
Forbid exec a restarting container
2016-01-27 11:43:43 +08:00
Sebastiaan van Stijn
3cf4884787
Merge pull request #19612 from Microsoft/jjh/apicontainerstest
...
Windows CI: Fixup docker_api_containers_test.go
2016-01-26 19:14:43 -08:00
Arnaud Porterie
603c04a789
Merge pull request #19744 from Microsoft/jjh/testhistory
...
Windows CI: Enable TestHistory* cli tests
2016-01-26 19:08:33 -08:00
Arnaud Porterie
864cca2287
Merge pull request #19605 from Microsoft/jjh/docker_api_images_test
...
Windows CI: Porting for docker_api_images_test.go
2016-01-26 19:04:25 -08:00
Arnaud Porterie
70c5e96cb8
Merge pull request #19604 from Microsoft/jjh/testrename
...
Windows CI: Fix TestRename*
2016-01-26 19:03:31 -08:00
Arnaud Porterie
51d4d8eff2
Merge pull request #19603 from Microsoft/jjh/testps
...
Windows CI: Address simple failures in TestPS*
2016-01-26 19:01:17 -08:00
Doug Davis
9b82174f93
Merge pull request #19742 from Microsoft/jjh/testrmi
...
Windows CI: Port TestRmi tests
2016-01-26 21:46:35 -05:00
Zhang Wei
1d2208fed9
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>
2016-01-27 10:05:06 +08:00
cyli
0617521ba2
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>
2016-01-26 18:02:00 -08:00
cyli
8fd2c8791d
Re-vendor notary, as well as change jfrazelle/go to docker/go.
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-01-26 18:02:00 -08:00
Lei Jitang
899f1b1870
Daemon: do GetRWLayer after checking if container use the current graph driver
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-26 20:20:30 -05:00
Tibor Vass
7992b353c0
Merge pull request #19737 from calavera/fix_reload_docs
...
Remove cluster storage advertise from reload.
2016-01-26 17:04:46 -08:00
Arnaud Porterie
3a70ab3a2c
Merge pull request #19688 from crosbymichael/tmpfs-tar
...
Remove tar copy-up for tmpfs mounts
2016-01-26 17:03:07 -08:00
Tibor Vass
3eaf878999
Merge pull request #19751 from crosbymichael/update-libcontainer-jan26
...
Update libcontainer to 3d8a20bb772defc28c355534d83
2016-01-26 16:57:49 -08:00
Jessica Frazelle
6807582cdc
updates to release checklist
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-26 16:20:23 -08:00
Sebastiaan van Stijn
eb729a0cb0
Merge pull request #19621 from moxiegirl/new-navigation
...
New navigation for 1.10
2016-01-26 16:06:29 -08:00
Jessica Frazelle
d0cb7e599e
add docs for package repo maintenance
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-26 15:59:08 -08:00
Mary Anthony
e310d070f4
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>
2016-01-26 15:58:53 -08:00
Sebastiaan van Stijn
e23ea05e11
Merge pull request #19743 from aaronlehmann/http-idle-timeouts
...
Set idle timeouts for HTTP reads and writes in communications with a registry
2016-01-26 15:39:52 -08:00
Sebastiaan van Stijn
4bcb6c7fc8
Merge pull request #19150 from mikedougherty/cs-108-rpm-release
...
[CS-108] Adjust version string processing for RPM build
2016-01-26 15:22:14 -08:00
David Calavera
fa163f5619
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>
2016-01-26 18:19:30 -05:00
Michael Crosby
7b5896702b
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>
2016-01-26 15:00:07 -08:00
Jess Frazelle
03864c1db0
Merge pull request #19730 from jfrazelle/update-tools-urls
...
update tools urls and remove things we dont use
2016-01-26 14:36:28 -08:00
Tibor Vass
0e4eda1691
Merge pull request #19738 from mrjana/mh
...
Vendoring libnetwork v0.6.0-rc5
2016-01-26 14:14:39 -08:00
Brian Goff
146e49b039
Merge pull request #19671 from calavera/volume-dangling
...
Make volume dangling filter return only used volumes with `dangling=false`.
2016-01-26 17:01:20 -05:00
Michael Crosby
ae8ec4860e
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>
2016-01-26 14:00:39 -08:00
Brian Goff
b775efc9bc
Merge pull request #19704 from cpuguy83/speedup_build_cache
...
Use imageStore.Children instead of whole the Map
2016-01-26 16:59:55 -05:00
Antonio Murdaca
0b248e88ff
Merge pull request #19734 from Microsoft/jjh/testtag
...
Windows CI: Port TestTag* cli tests
2016-01-26 22:56:36 +01:00
Sebastiaan van Stijn
d648a100c9
Merge pull request #19745 from cpuguy83/19625_docs_for_mount_prop_with_systemd
...
Add note about mount propagation on systemd
2016-01-26 13:51:22 -08:00
Brian Goff
7d7b2044b7
Add note about mount propagation on systemd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-26 16:48:45 -05:00
Tibor Vass
4adb0fb310
Merge pull request #19723 from bboreham/not-preferred
...
Stop referring to requested IP address as "preferred"
2016-01-26 13:46:09 -08:00