87dbf43805
Merge pull request #17105 from liaoqingwei/dev3
...
Use of checkers on docker_cli_pause_test.go.
Upstream-commit: 71982d8e576e659010426b94ba2c9fcfcb3e91c6
Component: engine
2015-10-16 17:36:56 +02:00
2f507073f8
Merge pull request #17102 from sdurrheimer/zsh-completion-build-build-arg
...
Add zsh completion for 'docker build --build-arg'
Upstream-commit: 579cf43f0fb266489da06ce93a5200cf53c9b37a
Component: engine
2015-10-16 08:34:12 -07:00
17fc3c7655
Merge pull request #17078 from kevinkucharczyk/api_version_test
...
Clean up integration-cli/docker_api_version_test.go
Upstream-commit: f9026e2b7b6431019f1a875e26174881f4275754
Component: engine
2015-10-16 08:26:53 -07:00
9cdb750bf4
Merge pull request #17053 from liaoqingwei/dev2
...
use of checkers on docker_cli_network_unix_test.go
Upstream-commit: 835fbee9a23300569f95092c60fbc00eedddb6c5
Component: engine
2015-10-16 09:36:59 -04:00
aa3a6d8798
bad d
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ee30af5ffb9b4db808c7e1e6db69c0c600e525c7
Component: engine
2015-10-16 06:09:03 -07:00
8cbac2fa0e
Removing extra tic
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e44876bf1fdb114a4730ef72f00e88c057abfb45
Component: engine
2015-10-16 06:07:52 -07:00
01a3690b02
Use of checkers on docker_cli_pause_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 851a533a823f1d158733e94afd4076c6a75f9706
Component: engine
2015-10-16 21:07:02 +08:00
a02e30a7f6
Merge pull request #17087 from LK4D4/speedup_ps
...
Speedup container list
Upstream-commit: dee57e4c3ec8b86ffb2958528fc81f981f85f730
Component: engine
2015-10-16 12:35:28 +02:00
2ebbc9e095
Use of checkers on docker_cli_network_unix_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 9e3db08363fa85a08d7e6f9aa5059d19291c83c0
Component: engine
2015-10-16 16:56:40 +08:00
ef552b72f9
Add zsh completion for 'docker build --build-arg'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 89e0990224f520f8772da4872dd277bae2c1287f
Component: engine
2015-10-16 08:48:12 +02:00
1c1b8094f5
Clean up integration-cli/docker_api_version_test.go
...
Signed-off-by: Kevin P. Kucharczyk <kevinkucharczyk@gmail.com >
Upstream-commit: 6f1b5946b13e617ab18c5325aac4859620045425
Component: engine
2015-10-16 07:03:39 +02:00
74b88c7e5c
Speedup container list
...
Remove all unneeded disk operations (reload TagStore, umarshal image)
for checking if image still points to same ID. Now slowest part is
queries to sqlite which hopefuly will be removed soon.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f256d8ad2d1fbd9407d2b7a8eb69c96665c4015e
Component: engine
2015-10-15 20:41:35 -07:00
0425a13d99
Merge pull request #16932 from c0b/fix-race-16924
...
Fix race #16924 [panic: runtime error: slice bounds out of range] docker daemon crash of racing
Upstream-commit: d35a1f2868692fb351e2ea84efc0014468fff293
Component: engine
2015-10-15 18:05:05 -05:00
d58c97726f
Merge pull request #17073 from ZJaffee/api_events_test
...
Cleaned up integration-cli/docker_api_events_test.go
Upstream-commit: 1052ff674cf41b175ce5ec764b489ff843675dbf
Component: engine
2015-10-16 00:22:29 +02:00
cd88a5b521
Merge pull request #17080 from ZJaffee/api_logs_test
...
Cleaned up integration-cli/docker_api_logs_test.go
Upstream-commit: 58b36ba242fd6c1d45f118d9b51ca2dd2cb395ee
Component: engine
2015-10-16 00:21:30 +02:00
30e90c5ea6
Merge pull request #16997 from Microsoft/10662-kill-parttwo
...
Windows: [TP4] docker kill handling part two
Upstream-commit: e1804098b9c9ebb6210af29045198bd5259bb834
Component: engine
2015-10-15 14:42:19 -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
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
8971270851
Cleaned up integration-cli/docker_api_logs_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 7aab43e8d4e71ea056d635c5659d32f2efbb3a3f
Component: engine
2015-10-15 13:33:31 -04: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
0794c030b2
Cleaned up integration-cli/docker_api_events_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 176d8c5a144a961b2d6590ae70279d3fc6e3ef31
Component: engine
2015-10-15 12:40:36 -04: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
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
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
803f14d503
Windows: [TP4] docker kill handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bc503ca8ab2303066cc64d752ffff05100a9b267
Component: engine
2015-10-13 16:04:49 -07:00
