58b36ba242
Merge pull request #17080 from ZJaffee/api_logs_test
...
Cleaned up integration-cli/docker_api_logs_test.go
2015-10-16 00:21:30 +02:00
e1804098b9
Merge pull request #16997 from Microsoft/10662-kill-parttwo
...
Windows: [TP4] docker kill handling part two
2015-10-15 14:42:19 -07:00
ebfed4d474
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
2015-10-15 13:48:39 -07:00
ff4026fa5b
Merge pull request #17084 from sdurrheimer/zsh-completion-network-ipam
...
Add zsh completion for '--ipam-driver --subnet --ip-range --gateway -…
2015-10-15 13:48:19 -07:00
a00c0d795d
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 >
2015-10-15 21:40:50 +02:00
080a906aac
Remove '-n -l --latest' options from 'docker network ls' in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-15 21:12:31 +02:00
f255155f6b
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
2015-10-15 11:00:43 -07:00
7aab43e8d4
Cleaned up integration-cli/docker_api_logs_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
2015-10-15 13:33:31 -04:00
add0d25029
Merge pull request #17054 from hqhq/hq_use_go1.4.3
...
Bump Go to 1.4.3 for builder
2015-10-15 10:13:23 -07:00
9216b08536
Merge pull request #16998 from vieux/engine_version
...
only display 'Engine Version' when it's not empty
2015-10-15 08:43:32 -07:00
0f00c36d65
Merge pull request #17004 from echo33/docker_cli_restart_test
...
use of checkers on docker_cli_restart_test.go
2015-10-15 13:31:05 +02:00
32ead68e9f
Merge pull request #16966 from MHBauer/image-refactor
...
refactor use of container struct from daemon
2015-10-15 07:30:08 -04:00
46f7ab3585
Added network to docker --help and help cleanup
...
Fixes https://github.com/docker/docker/issues/16909
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-15 03:10:39 -07:00
196af472a6
use of checkers on docker_cli_restart_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
2015-10-15 16:35:03 +08:00
e4dadeed88
Merge pull request #17011 from sunyuan3/TestRunWithBlkioInvalidWeight
...
update TestRunWithBlkioInvalidWeight
2015-10-15 08:34:52 +02:00
42d643af55
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 >
2015-10-15 14:02:18 +08:00
17b0017cd0
use Server Version
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-10-14 17:46:59 -07:00
919c3c1ec8
Merge pull request #17024 from sallyom/man-run-clarify
...
add clarity to -p option
2015-10-14 14:12:25 -07:00
84488e228a
Merge pull request #17030 from calavera/remove_var_check
...
Remove defensive check of mux vars handling.
2015-10-14 16:36:50 -04:00
b22f89cb77
Merge pull request #16221 from flavio/get-docker-update-suse-installation
...
Update SUSE/openSUSE installation script
2015-10-14 13:02:45 -07:00
37c6c53b56
add clarity to -p option
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-10-14 15:18:04 -04:00
400ac8a66c
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 >
2015-10-14 20:55:28 +02:00
2b4128e904
Merge pull request #16617 from zhangjianfnst/15869-improve-commandline-doc
...
Improve the way we deliver Examples in command line.
2015-10-14 11:05:27 -07:00
adb37a1b39
Merge pull request #17025 from albers/completion-inspect-size
...
[Fix #15796 ] Add bash completion for `docker inspect --size`
2015-10-14 13:48:43 -04:00
389ce0aae6
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 >
2015-10-14 10:31:09 -07:00
aaa8cae345
Merge pull request #16968 from MHBauer/network-refactor
...
refactor use of container struct from daemon
2015-10-14 17:48:08 +02:00
29714ee836
Add bash completion for docker inspect --size
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-10-14 17:34:56 +02:00
d60883eb10
Merge pull request #17006 from echo33/docker_cli_v2_only
...
use of checkers on docker_cli_v2_only.go
2015-10-14 10:27:37 -04:00
ddf04ad113
only display 'Engine Version' when it's not empty
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-10-14 06:45:11 -07:00
899ca94ce8
use of checkers on docker_cli_v2_only.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
2015-10-14 20:10:34 +08:00
d550fbb80e
update TestRunWithBlkioInvalidWeight
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-10-14 16:20:52 +08:00
cc653b5d61
Improve the way we deliver Examples in command line. (Add descriptive titles)
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
2015-10-14 11:04:51 +08:00
7a19164c17
Merge pull request #16995 from jfrazelle/lxc-i-loathe-you
...
Fix lxc
2015-10-13 19:00:24 -07:00
22a0b0a4f9
Merge pull request #16999 from tiborvass/bump_apiversion_to_v1.22
...
Bump API Version to v1.22
2015-10-13 18:59:09 -07:00
22a0ea5550
Bump API Version to v1.22
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-10-13 17:27:33 -07:00
3ad9cc996a
Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9
...
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
2015-10-13 16:56:19 -07:00
a0398fbd19
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 >
2015-10-13 16:34:28 -07:00
bc503ca8ab
Windows: [TP4] docker kill handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-13 16:04:49 -07:00
9c94dcea3d
Merge pull request #16863 from dhiltgen/bump_libkv
...
Bump to latest libkv + dependencies
2015-10-13 15:57:42 -07:00
28ad7c588f
update tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-13 15:52:14 -07:00
a17e53038d
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-10-13 15:48:13 -07:00
6ae6371d11
Merge pull request #16996 from jfrazelle/cleanup-no-reprepro
...
update release-deb from the reprepro stuff we don't use
2015-10-13 15:46:58 -07:00
3057f0f0a7
update release-deb from the reprepro stuff we don't use
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-13 15:42:39 -07:00
2465ab8814
Merge pull request #16991 from Microsoft/10662-fixuserns
...
Windows: [TP4] Fix AV due to userns
2015-10-13 15:16:36 -07:00
cfcddefacd
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 >
2015-10-13 14:46:59 -07:00
06f0d03ced
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 >
2015-10-13 14:46:59 -07:00
7078e7ddf4
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 >
2015-10-13 14:41:43 -07:00
4ea3ff7061
Merge pull request #16910 from mavenugo/ipam
...
Vendoring libnetwork for the pluggable IPAM driver support
2015-10-13 14:41:19 -07:00
ce607916e9
Merge pull request #15796 from azurezk/add-size-to-inspect
...
add container size info to inspect
2015-10-13 23:16:10 +02:00
6d71f27760
Windows: Fix AV in build due to userns
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-13 14:02:25 -07:00
Vincent Demeester