5eb96cf0cf
Fixing hang in archive.CopyWithTar with invalid dst
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: a150eee3085e2e1e4dbaecdd9668deb0ba3ab26b
Component: engine
2015-10-19 11:56:05 -07:00
24ba438ab4
Merge pull request #17082 from sdurrheimer/zsh-completion-remove-network-ls-old-options
...
Remove 'docker network ls -n -l --latest' options from in zsh completion
Upstream-commit: ebfed4d474489bfa8b0d16f6628c1e28388d8ea3
Component: engine
2015-10-15 13:48:39 -07:00
c1a007f689
Merge pull request #17084 from sdurrheimer/zsh-completion-network-ipam
...
Add zsh completion for '--ipam-driver --subnet --ip-range --gateway -…
Upstream-commit: ff4026fa5be873b5d5ec9aad733e5aaedadf516e
Component: engine
2015-10-15 13:48:19 -07:00
de9c63d909
Add zsh completion for '--ipam-driver --subnet --ip-range --gateway --aux-address' for 'docker network create'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a00c0d795dcba112262d3dd297247259f9b50488
Component: engine
2015-10-15 21:40:50 +02:00
d24169e5d2
Remove '-n -l --latest' options from 'docker network ls' in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 080a906aac1760922a2791e86dc10190600c9f7c
Component: engine
2015-10-15 21:12:31 +02:00
2a30cdb717
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
Upstream-commit: f255155f6b2e2205b9d644c663f2c8fb1570d4fe
Component: engine
2015-10-15 11:00:43 -07:00
d7142ce1bc
Merge pull request #17054 from hqhq/hq_use_go1.4.3
...
Bump Go to 1.4.3 for builder
Upstream-commit: add0d250298e1a0178c5de5d443ade718e3c61a9
Component: engine
2015-10-15 10:13:23 -07:00
46bdc83696
Merge pull request #16998 from vieux/engine_version
...
only display 'Engine Version' when it's not empty
Upstream-commit: 9216b085363f4551ffe3b6cdba983eba3b945205
Component: engine
2015-10-15 08:43:32 -07:00
7cb16e93cd
Merge pull request #17004 from echo33/docker_cli_restart_test
...
use of checkers on docker_cli_restart_test.go
Upstream-commit: 0f00c36d65101791c862d9cac0793336787c1667
Component: engine
2015-10-15 13:31:05 +02:00
27566cbbc9
Merge pull request #16966 from MHBauer/image-refactor
...
refactor use of container struct from daemon
Upstream-commit: 32ead68e9f233ae809c8928a74700748c50fa3c0
Component: engine
2015-10-15 07:30:08 -04:00
7b66bab8fb
Added network to docker --help and help cleanup
...
Fixes https://github.com/docker/docker/issues/16909
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 46f7ab35854151ac054bf04f2bb7b344374b6d02
Component: engine
2015-10-15 03:10:39 -07:00
cce8b7e14d
use of checkers on docker_cli_restart_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 196af472a6b423ed0547c0fb080aa548cd077efd
Component: engine
2015-10-15 16:35:03 +08:00
d7e9503657
Merge pull request #17011 from sunyuan3/TestRunWithBlkioInvalidWeight
...
update TestRunWithBlkioInvalidWeight
Upstream-commit: e4dadeed8860dbe748e7257ea13c792a8d82073b
Component: engine
2015-10-15 08:34:52 +02:00
fb276a0432
Bump Go to 1.4.3 for builder
...
We already bumped this for Dockerfile, should keep build environment
consistent with that.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 42d643af55a1a6e1a2262cb0e97fbe82589af40d
Component: engine
2015-10-15 14:02:18 +08:00
fbe671eb09
use Server Version
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 17b0017cd0949f0772a849e6e5d0ee6084ff5340
Component: engine
2015-10-14 17:46:59 -07:00
9e7f4f7c05
Merge pull request #17024 from sallyom/man-run-clarify
...
add clarity to -p option
Upstream-commit: 919c3c1ec82fc73a6bc88b2382687a606103ebe8
Component: engine
2015-10-14 14:12:25 -07:00
9dc239965f
Merge pull request #17030 from calavera/remove_var_check
...
Remove defensive check of mux vars handling.
Upstream-commit: 84488e228a8bf77598ccd25a5dd7d8f71bafced7
Component: engine
2015-10-14 16:36:50 -04:00
6d357aac9c
Merge pull request #16221 from flavio/get-docker-update-suse-installation
...
Update SUSE/openSUSE installation script
Upstream-commit: b22f89cb770ca54e219cb7c5aac590b13ed606d1
Component: engine
2015-10-14 13:02:45 -07:00
d5842bab30
add clarity to -p option
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 37c6c53b56c7a26bcce81bc12b83fadd4da8709a
Component: engine
2015-10-14 15:18:04 -04:00
7ca814e803
Update SUSE/openSUSE installation script
...
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.
Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.
Signed-off-by: Flavio Castelli <fcastelli@suse.com >
Upstream-commit: 400ac8a66cf3c40f162153dcecd44b4fa8e3453f
Component: engine
2015-10-14 20:55:28 +02:00
f672c8b33c
Merge pull request #16617 from zhangjianfnst/15869-improve-commandline-doc
...
Improve the way we deliver Examples in command line.
Upstream-commit: 2b4128e904cf5ffc288e45dbc049de73a905e4e6
Component: engine
2015-10-14 11:05:27 -07:00
0165544fe0
Merge pull request #17025 from albers/completion-inspect-size
...
[Fix #15796 ] Add bash completion for `docker inspect --size`
Upstream-commit: adb37a1b390a0cb54d620c3f9c9719a44d2078b6
Component: engine
2015-10-14 13:48:43 -04:00
f38f3109c2
Remove defensive check of mux vars handling.
...
We should not check if the mux framework internals work as expected in every handler.
The missing parameter error doesn't make sense from the user point of view.
This change initializes a proper vars context if the mux fails to do so and delegates
specific parameter error checks to the handlers.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 389ce0aae6a303660e591ef80272322ac82854e2
Component: engine
2015-10-14 10:31:09 -07:00
9be0d4300b
Merge pull request #16968 from MHBauer/network-refactor
...
refactor use of container struct from daemon
Upstream-commit: aaa8cae34537eb9bddacacc8bce61c91ca76d7d2
Component: engine
2015-10-14 17:48:08 +02:00
cce0231be7
Add bash completion for docker inspect --size
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 29714ee836fa263143986de8dc04bbf821277eab
Component: engine
2015-10-14 17:34:56 +02:00
4b1e8fe9a1
Merge pull request #17006 from echo33/docker_cli_v2_only
...
use of checkers on docker_cli_v2_only.go
Upstream-commit: d60883eb1041668771a1e94c0d7405693c71b486
Component: engine
2015-10-14 10:27:37 -04:00
aef0c60b60
only display 'Engine Version' when it's not empty
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ddf04ad113cd84da40dbd27379211751d50df435
Component: engine
2015-10-14 06:45:11 -07:00
06e65682ca
use of checkers on docker_cli_v2_only.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 899ca94ce8d78229195213d1558917eb98cbc7de
Component: engine
2015-10-14 20:10:34 +08:00
e864e1b06f
update TestRunWithBlkioInvalidWeight
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: d550fbb80e0ecf4b10c14e8b06bc8606101696dd
Component: engine
2015-10-14 16:20:52 +08:00
556b9df83a
Improve the way we deliver Examples in command line. (Add descriptive titles)
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: cc653b5d616ee8823c13b1b35ecf5f00e15463a8
Component: engine
2015-10-14 11:04:51 +08:00
1fa1874ac9
Merge pull request #16995 from jfrazelle/lxc-i-loathe-you
...
Fix lxc
Upstream-commit: 7a19164c179601898e748f1b45d0c82b949a6433
Component: engine
2015-10-13 19:00:24 -07:00
7da77f50b2
Merge pull request #16999 from tiborvass/bump_apiversion_to_v1.22
...
Bump API Version to v1.22
Upstream-commit: 22a0b0a4f926af6e73beb279e390e6333989c9bc
Component: engine
2015-10-13 18:59:09 -07:00
98858eadeb
Bump API Version to v1.22
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 22a0ea555069c47a132ac1579324e70d2bcde39d
Component: engine
2015-10-13 17:27:33 -07:00
1dd7cd942b
Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9
...
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
Upstream-commit: 3ad9cc996a3daf0c3f05972141bdfc6d8126d705
Component: engine
2015-10-13 16:56:19 -07:00
182a4806ba
refactor use of container struct from daemon
...
- do existence check instead of get container
- new connect method on daemon.
- cli network disconnect integration test
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: a0398fbd197b5c4cf261b702ba1a1f924d6134e8
Component: engine
2015-10-13 16:34:28 -07:00
095021089e
Merge pull request #16863 from dhiltgen/bump_libkv
...
Bump to latest libkv + dependencies
Upstream-commit: 9c94dcea3dbbe09fbd90e763bfbf19d687bff6c0
Component: engine
2015-10-13 15:57:42 -07:00
332d97bdef
update tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 28ad7c588f5ebaf5a41950b42a61759cf47c8de7
Component: engine
2015-10-13 15:52:14 -07:00
055fc64475
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: a17e53038d15ebb82f2dcdafb5c429609cccfb0d
Component: engine
2015-10-13 15:48:13 -07:00
00439678a1
Merge pull request #16996 from jfrazelle/cleanup-no-reprepro
...
update release-deb from the reprepro stuff we don't use
Upstream-commit: 6ae6371d113737b383b389d7ce54b6692e99f9c4
Component: engine
2015-10-13 15:46:58 -07:00
d72c4d5a02
update release-deb from the reprepro stuff we don't use
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 3057f0f0a7edd4d38485c5528cc2c991240e6b1c
Component: engine
2015-10-13 15:42:39 -07:00
08f1b17342
Merge pull request #16991 from Microsoft/10662-fixuserns
...
Windows: [TP4] Fix AV due to userns
Upstream-commit: 2465ab8814f46ec4381008ba2737b253cd762211
Component: engine
2015-10-13 15:16:36 -07:00
50f40c819d
daemon: execdriver: lxc: fix cgroup paths
...
When running LXC dind (outer docker is started with native driver)
cgroup paths point to `/docker/CID` inside `/proc/self/mountinfo` but
these paths aren't mounted (root is wrong). This fix just discard the
cgroup dir from mountinfo and set it to root `/`.
This patch fixes/skip OOM LXC tests that were failing.
Fix #16520
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com >
Upstream-commit: cfcddefacd125af4d909df653bccc8e3089a03b0
Component: engine
2015-10-13 14:46:59 -07:00
1a998995c2
daemon: execdriver: lxc: fix set memory swap
...
On LXC memory swap was only set to memory_limit*2 even if a value for
memory swap was provided. This patch fix this behavior to be the same
as the native driver and set correct memory swap in the template.
Also add a test specifically for LXC but w/o adding a new test
requirement.
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 06f0d03cede5f6cdaca87f6b786555b023d5286f
Component: engine
2015-10-13 14:46:59 -07:00
22d67b7818
Bump to latest libkv/libnetwork + dependencies
...
The latest libkv uses a different etcd library. Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 7078e7ddf42ad0beeb61e82cb1544d74def98adf
Component: engine
2015-10-13 14:41:43 -07:00
0e3861a2d2
Merge pull request #16910 from mavenugo/ipam
...
Vendoring libnetwork for the pluggable IPAM driver support
Upstream-commit: 4ea3ff70618d28520d2ae787bd00206d05c9f1db
Component: engine
2015-10-13 14:41:19 -07:00
019ffb819f
Merge pull request #15796 from azurezk/add-size-to-inspect
...
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
2015-10-13 23:16:10 +02:00
486257052d
Windows: Fix AV in build due to userns
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6d71f277608b2a655df0942d00607f47dbcaa37b
Component: engine
2015-10-13 14:02:25 -07:00
517874fd19
Merge pull request #16965 from mikebrow/docs-improvement-for-expose-16634
...
updating docs for EXPOSE option on run command
Upstream-commit: 9be87c9a96ba902214609bf486951a7dc171b82f
Component: engine
2015-10-13 11:33:28 -07:00
6ed533b627
Merge pull request #16922 from albers/completion-network
...
[Fix #16919 ] Add bash completion for `docker network`
Upstream-commit: 3fc75c97399676ae2ac6e667a517ecee640d9138
Component: engine
2015-10-13 11:25:54 -07:00
28ef1f3885
Merge pull request #16981 from sallyom/typos-man
...
various man page typos
Upstream-commit: dd43c23812612987c0cbda0d5c489578ed66d09d
Component: engine
2015-10-14 04:25:26 +10:00
