2f2d8462ab
update docker_cli_port_test.go with Assert
...
Part of #16756
Use c.Assert instead of condition judgement
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 1ae4eeb8136485e78b54de269c70a995fbaab9dd
Component: engine
2015-10-16 22:58:51 +08:00
5845714a6c
make sure the value of the dangling filter is correct
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 98c1a412b4102deb3ff58dd035447dc5a9d23ce3
Component: engine
2015-10-16 22:09:32 +08: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
e5c2b01462
Merge pull request #17112 from moxiegirl/fix-16961-tic
...
Removing extra tic
Upstream-commit: 60b5b0d380bbd7ee87e175395f1e4a6f487e8263
Component: engine
2015-10-16 09:10:12 -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
97ebdafc04
Add missing options to bash completion for docker import
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b0315375f887600cc98c63b434e8d2401fc3d1d8
Component: engine
2015-10-16 12:42:12 +02:00
bb7266ff8d
bash completion: minor refactoring for consistency
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3a713d91ce7d9edfe301e367f097d8cf370d2c52
Component: engine
2015-10-16 12:41:09 +02:00
c9f49c5202
Add missing options to bash completion for docker build
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 28c66b04911e98617be65bd4dce9cb9b9e134e4c
Component: engine
2015-10-16 12:40:55 +02: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
4dda269d8d
Fix cancel build doesn't remove the intermediate container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9392de9dfefc851139146161aa322e6c9e74cacf
Component: engine
2015-10-16 05:18:10 -04: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
551d7de4db
Add zsh completion for 'docker import -m --message'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 96a09ea77cc4d8f80be4bd3e382688223e8c5c7e
Component: engine
2015-10-16 10:14:42 +02: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
9a4b26a580
Deprecate 'docker run -c' option in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: c37c9df18a2fc3c34be3d8d21dae16553c8d4633
Component: engine
2015-10-16 08:37:16 +02:00
5f8debf9b3
Add zsh completion for 'unless-stopped' restart policy
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cb2bd8bcec38a597208209f0fb52593f3b6844a4
Component: engine
2015-10-16 08:30:56 +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
1b88203e58
MINOR typo fix.
...
Signed-off-by: GabrielNicolasAvellaneda <avellaneda.gabriel@gmail.com >
Upstream-commit: 3c1db8829028078dd15f17d4f1b4316beb6fbccc
Component: engine
2015-10-15 19:54:35 -03: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
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
494b1b71ae
Correct API docs for /images/create
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2ec4404ba039c6e6c40358cecd7d7ca16ee5b3e7
Component: engine
2015-10-15 16:00:05 -04: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
0d26194398
Cleaned up integration-cli/docker_api_network_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 7345050e4d5d360a7d808e8dd74f879bd12ebe99
Component: engine
2015-10-15 13:37:54 -04: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
065ee8e4a7
Remove references to the docker-ut image
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: ac9c0f81df348519ed3fba337fb862952afed58b
Component: engine
2015-10-15 15:02:26 +01: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
e8859795ce
Use c.Assert in integration-cli/docker_cli_logs_test.go
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: 946e8cde53734c702b7828e2a0bff1d3229e71e1
Component: engine
2015-10-15 10:53:19 +08:00
453cdc0662
remove incorrect "readonly" example
...
The :ro option can only be used for named and bind-mounted
volumes, not on "regular" (unnamed) volumes as explained in
https://github.com/docker/docker/pull/16013#issuecomment-146647216
The example in the documentation actually resulted in a
bind-mounted volume, mounted at "ro" inside the container.
This removes the incorrect example from the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 244d9c337034b0db030c05189ca8eb2323d92c61
Component: engine
2015-10-14 17:56:38 -07: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
