toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,319 Commits 3 Branches 295 Tags
2dad2ae0d3313c878a6a3b013df4042e4ed1c996
Commit Graph
19319 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 2dad2ae0d3 Merge pull request #17389 from tonistiigi/15995-duplicate-names 
Fix duplicate container names conflict
Upstream-commit: b72a431928d6389727d07235bc4d5a7b22403a53
Component: engine
 2015-10-27 02:42:50 -04:00
Sebastiaan van Stijn 8832da6b74 Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking 
zsh: enable option stacking
Upstream-commit: b92fd9ff0499deb7303557ef8163f0661361a8c0
Component: engine
 2015-10-27 01:39:04 +01:00
David Calavera 7c4b8bccf9 Merge pull request #17381 from mavenugo/rc3v1 
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Upstream-commit: 91de5ddf1896347c05f5292b8a0de0fbad3e4ce2
Component: engine
 2015-10-26 17:06:01 -07:00
Tonis Tiigi 6085efedb0 Fix duplicate container names conflict 
While creating multiple containers the second 
container could remove the first one from graph
and not produce an error.

Fixes #15995

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: aee54863741fc3f012c423d1a445d1a6b687966a
Component: engine
 2015-10-26 16:57:50 -07:00
David Calavera b67a8a66b5 Merge pull request #17285 from Microsoft/10662-exectp4workaround 
Windows [TP4] Trap Hyper-V exec failure
Upstream-commit: fe1e04a84f51b3abf5fd426a6a4ee0125683aa11
Component: engine
 2015-10-26 16:47:51 -07:00
David Calavera 8335ef1684 Merge pull request #17378 from Microsoft/10662-unmountwithsyscall 
Windows: Volumes PR rename UnmountWithSyscall
Upstream-commit: 4cbe227db868f347a493ec611b1c8131dc5509df
Component: engine
 2015-10-26 16:15:00 -07:00
Tibor Vass 80a2aecaad Merge pull request #17384 from mavenugo/42def 
Simple Info log to indicate the chosen IP Address for the default bridge
Upstream-commit: 3f11360a54499ad2d1c873c7e502b414d907528d
Component: engine
 2015-10-26 19:11:56 -04:00
Vincent Demeester 9b6c8de881 Merge pull request #17377 from LK4D4/remove_host_integration 
Remove contrib/host-integration
Upstream-commit: bffcb8226e400bf945bd233a7ecdf44cad2bb3ac
Component: engine
 2015-10-26 23:45:20 +01:00
Vincent Demeester 744e201d80 Merge pull request #17257 from echo33/docker_cli_exec_test 
use of checkers on docker_cli_exec_test.go
Upstream-commit: f3f63c6044057637f3eadf78c2c939ef60556db7
Component: engine
 2015-10-26 23:14:38 +01:00
Vincent Demeester 6cbdc15b43 Merge pull request #17331 from coolljt0725/fix_redundat_log 
Better daemon log on docker load
Upstream-commit: 0d963de867527d0792f6b9378805323f24bd76db
Component: engine
 2015-10-26 23:09:00 +01:00
Alexander Morozov 167327db18 Merge pull request #16772 from Microsoft/10662-refactorresources 
Windows: Refactor resources structure
Upstream-commit: 0bd7aedc365edd494a93f6fd3b2501d17195026d
Component: engine
 2015-10-26 15:01:17 -07:00
Vincent Demeester ae1be9214f Merge pull request #17256 from liaoqingwei/16756-docker_cli_config_test 
Use of checkers on docker_cli_config_test.go
Upstream-commit: 962243e3878ba214f65fe7a9b88462644533c333
Component: engine
 2015-10-26 23:00:04 +01:00
Madhu Venugopal 0eb23a0f71 Simple log to indicate the chosen IP Address for the default bridge 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 126d1b6ca195ed425a691a5f3faeba254ebff094
Component: engine
 2015-10-26 14:46:08 -07:00
Sebastiaan van Stijn 641ecc1ebd Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install 
apparmor check version on deb install
Upstream-commit: 9312a738d84e880bf4635ba4b7729b3c2e017fbc
Component: engine
 2015-10-26 22:44:11 +01:00
Vincent Bernat 9d52fef685 zsh: allow option stacking for short options without arguments 
This enables Zsh to understand commands like "docker run -it
ubuntu". However, by enabling this, this also makes Zsh completes
"docker run -u<tab>" with "docker run -uapprox" which is not valid. The
users have to put the space or the equal sign themselves before trying
to complete.

Therefore, this behavior is disabled by default. To enable it:

    zstyle ':completion:*:*:docker:*' option-stacking yes
    zstyle ':completion:*:*:docker-*:*' option-stacking yes

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 402caa94d23ea3ad47f814fc1414a93c5c8e7e58
Component: engine
 2015-10-26 21:58:59 +01:00
Vincent Bernat fc2e9f4e02 zsh: allow short options to specify their arguments with "=" 
This is allowed by Docker and helps the completion to not get confused
when a user uses this notation. This will also help to enable stacking
of short options since Zsh needs that to not stack options with
arguments.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 8ac32d900a6d1cd20e9585d012b0be414507e727
Component: engine
 2015-10-26 21:58:59 +01:00
Madhu Venugopal 0759578039 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 139d1e13e29ed987face1494471fdb6c986d6c4a
Component: engine
 2015-10-26 13:56:56 -07:00
John Howard ff22689d64 Windows: Refactor resources structure 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b1220a763c5046efe8caa3e245c84633a29c3684
Component: engine
 2015-10-26 13:48:16 -07:00
David Calavera e73cfc9762 Merge pull request #17206 from liaoqingwei/16756-docker_cli_import_test 
Use of checkers on docker_cli_import_test.go
Upstream-commit: 2dd822f3226393b5611364785793d38a44debd08
Component: engine
 2015-10-26 13:42:02 -07:00
David Calavera e1896c63ba Merge pull request #17266 from cpuguy83/dump_http_request_on_debug 
Dump request when daemon is set to debug
Upstream-commit: e252fe288cda563e10f70f55f934f1e05ee06729
Component: engine
 2015-10-26 13:41:14 -07:00
John Howard 16f288f74f Windows: Volumes PR fix one of Tibors nits 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 853f2e9952b94c52101d69003161b654a7cd4384
Component: engine
 2015-10-26 13:34:49 -07:00
Michael Crosby c164ea0c2b Merge pull request #17374 from brahmaroutu/fix_gccgo_ci 
GCCGO requires more memory and time to start containers, fixing GCCGO…
Upstream-commit: 8173acca9530dc3ff090f6025e6940e3f1f6f116
Component: engine
 2015-10-26 13:33:59 -07:00
Michael Crosby d358a1b7cc Merge pull request #17313 from calavera/version_exec_json_check 
Version exec json check.
Upstream-commit: 5cf028d3ddc8808bbd3ff710cdd82bf4a04042a2
Component: engine
 2015-10-26 13:32:32 -07:00
David Calavera e5892da983 Merge pull request #17286 from FeroVolar/namegenerator 
Add Heyrovsky
Upstream-commit: c52fdce2f2146a478623a33982758c1c89fd1dbb
Component: engine
 2015-10-26 13:26:43 -07:00
David Calavera fdb9949e2c Merge pull request #17376 from LK4D4/fix_dumper 
Fix dumper program to use proper import
Upstream-commit: 1b9d064b73428fe64b171d38c676e4dfefea7668
Component: engine
 2015-10-26 13:25:36 -07:00
Michael Crosby 37bb29c370 Merge pull request #17368 from HuKeping/update-test 
Update docker_cli_build_unix_test
Upstream-commit: 74a881c9e4e4010d79799baec751e278864b5509
Component: engine
 2015-10-26 13:21:31 -07:00
Alexander Morozov f73c11178a Remove contrib/host-integration 
It's outdated and unused.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0dec8091a23dcb877b4a881face936fb0689420c
Component: engine
 2015-10-26 13:18:50 -07:00
Alexander Morozov 1ff12191d8 Fix dumper program to use proper import 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1477a3d7fda5e8b29d68ffd5c4d6edead9ba2c61
Component: engine
 2015-10-26 13:10:01 -07:00
Brian Goff e58c7d88fe Merge pull request #17180 from rhatdan/destroy 
Docker is calling cont.Destroy twice on success
Upstream-commit: 5087e8c2e86ba61d7cec9abec00ee6bf64939d0d
Component: engine
 2015-10-26 15:48:04 -04:00
Brian Goff da50e3fb15 Merge pull request #17343 from fgimenez/16756-refactor-docker_cli_external_graphdriver_unix_test-to-use-checker 
Use checker assert for docker_cli_external_graphdriver_unix_test.go
Upstream-commit: b21f95c6125cf183fe04bcb23f40f3bffbddca54
Component: engine
 2015-10-26 15:39:08 -04:00
David Calavera 7e73e071bd Version exec json check. 
Keep backwards compatibility with old versions of the api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0b5e628e14a673cd1940876b2f3d091c2fe236d9
Component: engine
 2015-10-26 15:12:06 -04:00
Srini Brahmaroutu 654728d047 GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 2046ba3e3ceee6c51f6e4c55f5d26af212d2dc3e
Component: engine
 2015-10-26 19:09:00 +00:00
Sebastiaan van Stijn 15bb74c0cb Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag 
Add zsh completion for 'docker build' multi tags
Upstream-commit: 74b9d89648ffe55ca5b7f0d67cf28ff6bc404f36
Component: engine
 2015-10-26 19:05:23 +01:00
Alexander Morozov 07425589a1 Merge pull request #17351 from mavenugo/predefined 
Prevent user from deleting pre-defined networks
Upstream-commit: 34439f3ecb5cbde2f733e162179dfbe57dbaabff
Component: engine
 2015-10-26 10:06:45 -07:00
Tibor Vass 80d5075264 Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options 
Fix repeatable options in zsh completion
Upstream-commit: 7e275cf0e5e1edff77ce9b159e995e03f6ac3371
Component: engine
 2015-10-26 12:43:21 -04:00
Hu Keping abd9d36021 Update docker_cli_build_unix_test 
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: f410d7e70f7196673ed63a7aa7dec25ad4475ef1
Component: engine
 2015-10-26 21:06:11 +08:00
Antonio Murdaca 5c51a1e94a Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test 
Using checkers assert for integration-cli/docker_cli_export_import_test.go
Upstream-commit: 9328fc7e62e703ac5bae7de5fdf9c02dbcccb034
Component: engine
 2015-10-26 13:58:21 +01:00
Federico Gimenez 15e5b8010a Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go 
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
Upstream-commit: 7058ec278dcd27fce62c50b1e462aca8ade42439
Component: engine
 2015-10-26 09:09:38 +01:00
liaoqingwei f303148ee9 Use of checkers on docker_cli_config_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
Upstream-commit: d1ed5f62adadac202e34d11d513a9c7bc946ab27
Component: engine
 2015-10-26 10:51:12 +08:00
weiyan 2e3f8e6b23 use of checkers on docker_cli_exec_test.go 
Signed-off-by: weiyan <weiyan3@huawei.com>
Upstream-commit: 9120a1fc3ef929b18200b4f315bb7147889a0c36
Component: engine
 2015-10-26 10:01:48 +08:00
Brian Goff d8b43fba9e Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test 
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
Upstream-commit: 75128c46c7881325c87de8797b455534558784ed
Component: engine
 2015-10-25 20:39:32 -04:00
Madhu Venugopal e52c395265 Prevent user from deleting pre-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ead62b59522bba132b9a14712e4350439e7fa2a5
Component: engine
 2015-10-25 17:17:29 -07:00
Vincent Demeester e999854115 Merge pull request #17332 from askb/17225_flakytest_TestExecEnv 
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
Upstream-commit: c71e97fc122d82c4bd99e47b38000d216bf360f2
Component: engine
 2015-10-25 21:17:50 +01:00
Doug Davis feabc90175 Merge pull request #17348 from askb/17243_flaykytest_TestExecAfterContainerRestart 
Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
Upstream-commit: 029e7ae4e02683edda30255d3484e8009b121b2a
Component: engine
 2015-10-25 13:25:21 -04:00
Anil Belur b01426a7bc Fix for #17243 DockerSuite.TestExecAfterContainerRestart. 
Added waitRun(containerID) statement after docker run -d and docker restart
to ensure the container is restarted before issuing a exec cmd.

Signed-off-by: Anil Belur <askb23@gmail.com>
Upstream-commit: 2a5f04dcc900888ff706e36e6360d0b51d82bed1
Component: engine
 2015-10-25 21:43:31 +05:30
Sebastiaan van Stijn 4532f9f1f3 Merge pull request #17339 from moxiegirl/docs-readme-update 
Tweaking some things
Upstream-commit: 5bcd6aba4b59163564187edb1c3d4fc8265da95a
Component: engine
 2015-10-25 16:45:04 +01:00
Tibor Vass 107977a6ca Merge pull request #17325 from aboch/d0 
Disable built-in SD on default bridge network
Upstream-commit: 271f85afac94b224a8e2d4dd99936bafba18a473
Component: engine
 2015-10-25 11:04:27 -04:00
moxiegirl be6855048d Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax 
Update docker network inspect help syntax
Upstream-commit: c10ef20ed86befcf15b32d5081165bbd28b01c94
Component: engine
 2015-10-24 21:56:38 -07:00
Mary Anthony 0fee88ca54 Tweaking some things 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5560e8a61cd1920f915274e6cd6618d31c698247
Component: engine
 2015-10-24 18:07:08 -07:00
Anil Belur 082dcadcb4 Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case. 
This is done by calling waitRun() followed by the docker run, which ensures the container is loaded
before calling docker exec to obtain the env variable set previously.

Incorporated the change as suggeted by duglin.

Signed-off-by: Anil Belur <askb23@gmail.com>
Upstream-commit: 6d974ec19d2f484586ec57c2e2455a6de927cddf
Component: engine
 2015-10-24 22:54:24 +05:30