Brian Goff
d7cb8baf09
Fix issue where conn is stuck waiting for stdin
...
This was hard to repro, but found out it seems to only happen with TLS
connections.
When `docker run -i` was set, the client gets stuck waiting for sdin on
exit, and requires hitting return twice.
This fix ensures that:
1. When stdin is done, wait for stdout always
2. When stdout is done, close the stream and wait for stdin to finish
On 2, stdin copy should return immediately now since the out stream is closed.
Note that we probably don't actually even need to wait here.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-10-16 15:16:25 -04:00
Daniel Nephin
26dc0b785b
Give the user a better error message (without a stack trace) when there is a yaml error.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-16 15:05:06 -04:00
Sebastiaan van Stijn
ccf5b60c6f
Merge pull request #17098 from sdurrheimer/zsh-completion-import-message
...
Add zsh completion for 'docker import -m --message'
2015-10-16 11:36:46 -07:00
Tibor Vass
b054a88af1
Merge pull request #17093 from endophage/update_notary_gotuf
...
updating notary and gotuf with latest bugfixes
2015-10-16 11:19:21 -07:00
Zachary Jaffee
7b6bca5af1
cleaned up integration-cli/docker_api_exec_resize_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
2015-10-16 13:22:40 -04:00
Sebastiaan van Stijn
e2870bda43
Merge pull request #17085 from dnephin/add_digest_to_api_docs
...
Correct API docs for /images/create
2015-10-16 10:10:41 -07:00
Vincent Demeester
2afdab4454
Merge pull request #17100 from WeiZhang555/port-inte
...
update docker_cli_port_test.go with Assert
2015-10-16 19:06:14 +02:00
Cameron Eagans
6048630a11
docker-compose pull SERVICE should not pull SERVICE's dependencies
...
Signed-off-by: Cameron Eagans <me@cweagans.net >
2015-10-16 12:59:57 -04:00
Aanand Prasad
46de4411a7
Revert networking-related changes to getting started guides
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-10-16 12:59:57 -04:00
Karol Duleba
883f251e7d
Docs for shorthand notation of extends. Issue #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com >
2015-10-16 12:59:57 -04:00
Daniel Nephin
284cda087e
Add missing merge for release branch.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-16 12:59:57 -04:00
Daniel Nephin
b2f9c182f3
Fix some release docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-16 12:59:57 -04:00
Daniel Nephin
558098d322
Add a script to generate contributor list.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-16 12:59:57 -04:00
Per Persson
6571e079b9
Remove incorrectly placed comment
...
I'm not sure if it should be there at all, but at least it should hardly be where it currently is located.
Signed-off-by: Per Persson <per.persson@exertisztorm.com >
2015-10-16 12:59:57 -04:00
Tim Butler
49ca23c034
Fix link to Release Process doc in README.md
...
Signed-off-by: Tim Butler <tim.butler.au@gmail.com >
2015-10-16 12:59:57 -04:00
Ying Li
81380e0862
Even simpler - cancel the GRPC call using the context object passed
...
to the GRPC clients - thanks @endophage!
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-16 09:46:08 -07:00
David Lawrence
7ce9f02751
updating notary and gotuf with latest bugfixes
...
Signed-off-by: David Lawrence <david.lawrence@docker.com >
2015-10-16 09:33:26 -07:00
mnowster
4b939d3560
Merge pull request #2199 from cweagans/1752-docker-compose-pull-service-nodeps
...
docker-compose pull SERVICE should not pull SERVICE's dependencies
2015-10-16 17:12:28 +01:00
mnowster
a712d828d4
Merge pull request #2200 from aanand/revert-tutorials
...
Revert networking-related changes to getting started guides
2015-10-16 17:06:31 +01:00
David Calavera
841205ec01
Merge pull request #17062 from coolljt0725/fix_cancel
...
Fix cancel build doesn't remove the intermediate container
2015-10-16 09:06:09 -07:00
Brian Goff
08a43b8b3b
Merge pull request #17101 from sdurrheimer/zsh-completion-deprecate-run-dash-c-option
...
Deprecate 'docker run -c' option in zsh completion
2015-10-16 11:40:02 -04:00
Brian Goff
30b945fac9
Merge pull request #17099 from sdurrheimer/zsh-completion-restart-unless-stopped
...
Add zsh completion for 'unless-stopped' restart policy
2015-10-16 11:37:27 -04:00
Vincent Demeester
71982d8e57
Merge pull request #17105 from liaoqingwei/dev3
...
Use of checkers on docker_cli_pause_test.go.
2015-10-16 17:36:56 +02:00
David Calavera
579cf43f0f
Merge pull request #17102 from sdurrheimer/zsh-completion-build-build-arg
...
Add zsh completion for 'docker build --build-arg'
2015-10-16 08:34:12 -07:00
David Calavera
f9026e2b7b
Merge pull request #17078 from kevinkucharczyk/api_version_test
...
Clean up integration-cli/docker_api_version_test.go
2015-10-16 08:26:53 -07:00
Zhang Wei
1ae4eeb813
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 >
2015-10-16 22:58:51 +08:00
Mazz Mosley
7b109bc026
Attempt to document escaping env vars
...
People are likely to run into their env vars being set to empty strings,
if they're not aware that they need to escape them for Compose to not
interpolate them.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-10-16 15:32:02 +01:00
Shijiang Wei
98c1a412b4
make sure the value of the dangling filter is correct
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-10-16 22:09:32 +08:00
Brian Goff
835fbee9a2
Merge pull request #17053 from liaoqingwei/dev2
...
use of checkers on docker_cli_network_unix_test.go
2015-10-16 09:36:59 -04:00
Brian Goff
60b5b0d380
Merge pull request #17112 from moxiegirl/fix-16961-tic
...
Removing extra tic
2015-10-16 09:10:12 -04:00
Mary Anthony
ee30af5ffb
bad d
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-10-16 06:09:03 -07:00
Mary Anthony
e44876bf1f
Removing extra tic
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-10-16 06:07:52 -07:00
liaoqingwei
851a533a82
Use of checkers on docker_cli_pause_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
2015-10-16 21:07:02 +08:00
Harald Albers
b0315375f8
Add missing options to bash completion for docker import
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-10-16 12:42:12 +02:00
Harald Albers
3a713d91ce
bash completion: minor refactoring for consistency
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-10-16 12:41:09 +02:00
Harald Albers
28c66b0491
Add missing options to bash completion for docker build
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-10-16 12:40:55 +02:00
Antonio Murdaca
dee57e4c3e
Merge pull request #17087 from LK4D4/speedup_ps
...
Speedup container list
2015-10-16 12:35:28 +02:00
mnowster
b0c895c5f5
Merge pull request #2193 from mrfuxi/less-verbose-extends-docs
...
Docs for shorthand notation of extends. Issue #1989
2015-10-16 10:25:10 +01:00
Lei Jitang
9392de9dfe
Fix cancel build doesn't remove the intermediate container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-10-16 05:18:10 -04:00
liaoqingwei
9e3db08363
Use of checkers on docker_cli_network_unix_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
2015-10-16 16:56:40 +08:00
Steve Durrheimer
96a09ea77c
Add zsh completion for 'docker import -m --message'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-16 10:14:42 +02:00
Steve Durrheimer
89e0990224
Add zsh completion for 'docker build --build-arg'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-16 08:48:12 +02:00
Steve Durrheimer
c37c9df18a
Deprecate 'docker run -c' option in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-16 08:37:16 +02:00
Steve Durrheimer
cb2bd8bcec
Add zsh completion for 'unless-stopped' restart policy
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-16 08:30:56 +02:00
Aanand Prasad
1ed23fb2de
Revert networking-related changes to getting started guides
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-10-16 11:58:27 +05:30
Kevin P. Kucharczyk
6f1b5946b1
Clean up integration-cli/docker_api_version_test.go
...
Signed-off-by: Kevin P. Kucharczyk <kevinkucharczyk@gmail.com >
2015-10-16 07:03:39 +02:00
Alexander Morozov
f256d8ad2d
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 >
2015-10-15 20:41:35 -07:00
Victor Vieux
4d13ce89f8
Merge pull request #1303 from abronan/fix_zk_tests_timing
...
Integration: Fix timing issue on zookeeper failure test
2015-10-15 16:46:17 -07:00
Victor Vieux
384c29163a
Merge pull request #1299 from dnephin/use_parse_repo_tags
...
Use ParseRepositoryTag() from engine
2015-10-15 16:43:11 -07:00
Nathan LeClaire
a63f26f438
Merge pull request #1991 from dmp42/01-carry-on-build-tweaks
...
Add simpler make targets and fix Windows build
2015-10-15 16:43:01 -07:00