Cameron Eagans
53fc6d06f6
docker-compose pull SERVICE should not pull SERVICE's dependencies
...
Signed-off-by: Cameron Eagans <me@cweagans.net >
2015-10-15 17:33:32 -06:00
Vincent Batts
d35a1f2868
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
2015-10-15 18:05:05 -05:00
GabrielNicolasAvellaneda
3c1db88290
MINOR typo fix.
...
Signed-off-by: GabrielNicolasAvellaneda <avellaneda.gabriel@gmail.com >
2015-10-15 19:54:35 -03:00
David Lawrence
089d8450d8
Merge pull request #218 from endophage/update_gotuf
...
updating gotuf in godeps
2015-10-15 15:30:19 -07:00
Vincent Demeester
1052ff674c
Merge pull request #17073 from ZJaffee/api_events_test
...
Cleaned up integration-cli/docker_api_events_test.go
2015-10-16 00:22:29 +02:00
Vincent Demeester
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
David Lawrence
15b07101c0
updating gotuf dependency
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-15 14:52:18 -07:00
David Calavera
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
Nathan LeClaire
600ffb7d20
Merge pull request #1968 from cmouttet/1967-openstack_InstanceIpAddress_default
...
add default AddressType: Fixed
2015-10-15 14:19:54 -07:00
Karol Duleba
ccfb6e6fa8
Docs for shorthand notation of extends. Issue #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com >
2015-10-15 22:17:13 +01:00
Victor Vieux
bef2892cee
Merge pull request #1271 from jimmyxian/fix-reschedule-with-soft-affinity
...
Do not try retry with soft-image-affinity when have node constraint
2015-10-15 13:52:29 -07:00
Jess Frazelle
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
Jess Frazelle
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
Olivier Gambier
3e2e3d0a59
Build system enhancements
...
- new simpler targets:
* make machine
* make plugins
* make cross
- fixed windows cross build to output .exe files
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-10-15 13:26:45 -07:00
Daniel Nephin
2ec4404ba0
Correct API docs for /images/create
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-15 16:00:05 -04:00
Steve Durrheimer
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
Daniel Nephin
8f840a55de
Merge pull request #2194 from dnephin/update_release_docs
...
Update release docs
2015-10-15 15:40:13 -04:00
Steve Durrheimer
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
Stephen Day
dfe60f4cb1
Merge pull request #827 from aaronlehmann/read-only-mode-2
...
Add a read-only mode as a configuration option
2015-10-15 11:50:31 -07:00
Richard Scothern
539d6312bf
Merge pull request #1053 from mrwacky42/patch-1
...
Fix spelling
2015-10-15 11:44:57 -07:00
Richard Scothern
d87cf10852
Merge pull request #1094 from aaronlehmann/correct-payload-serialization-order
...
Correct unmarshal order for SignedManifest
2015-10-15 11:44:12 -07:00
Ying Li
faff328d62
Simplify by using a single buffered channel, instead of having a done
...
channel and a regular channel - thanks @aaronlehmann!
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-15 11:43:17 -07:00
Ying Li
23a5d42bf6
Use a done channel to clean up and prevent the goroutine from writing
...
to a closed channel.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-15 11:15:07 -07:00
David Calavera
f255155f6b
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
2015-10-15 11:00:43 -07:00
Ying Li
5f65d86411
Update circle-ci to use go 1.5.1
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-15 10:49:26 -07:00
Ying Li
a49406de42
Log an error if the notary server cannot reach the signer or otherwise
...
if the signer is in trouble, but do not fail the health check, since
the server can operate for a while without the signer (the server will
have degraded performance, but is not down)
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-15 10:48:10 -07:00
Zachary Jaffee
7345050e4d
Cleaned up integration-cli/docker_api_network_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
2015-10-15 13:37:54 -04:00
Ying Li
a1edc02b82
Use a function interface instead of declaring an anonymous interface in
...
the function arguments.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-15 10:34:11 -07:00
Zachary Jaffee
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
Tianon Gravi
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
Zachary Jaffee
176d8c5a14
Cleaned up integration-cli/docker_api_events_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
2015-10-15 12:40:36 -04:00
Daniel Nephin
910fec887d
Use ParseRepositoryTags from engine.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-15 12:30:07 -04:00
Daniel Nephin
f69f0e41d4
Add github.com/docker/docker/pkg/parsers/
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-15 12:30:07 -04:00
Aaron Lehmann
c56e8c2533
Simplify proxy scheduler
...
The proxy scheduler implemented its own timer state machine. It's
simpler and more efficient to leverage the Go runtime's timer heap by
using time.AfterFunc.
This commit adds a time.Timer to each scheduler entry, and starts and
stops those timers as necessary. Then the mainloop goroutine and its
associated logic are not needed.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-10-15 09:18:21 -07:00
Ying Li
b94915628b
Changing docstring to re-trigger CI
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-15 09:13:24 -07:00
Alexandre Beslic
755e68b5cf
Fix timing issue on zookeeper failure test
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-10-15 08:52:00 -07:00
Arnaud Porterie
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
mnowster
4d8b184b14
Merge pull request #2196 from md2perpe/patch-1
...
Remove incorrectly placed comment
2015-10-15 15:31:49 +01:00
mnowster
971bfd403e
Merge pull request #2195 from timbutler/master
...
Fix link to Release Process doc in README.md
2015-10-15 15:30:00 +01:00
Li Yi
ad14545745
Redundant digest verification in validateBlob
...
Change-Id: I03764edadae529db2cc3acf7ecca329570f18659
Signed-off-by: Li Yi <denverdino@gmail.com >
2015-10-15 22:21:14 +08:00
Aidan Hobson Sayers
ac9c0f81df
Remove references to the docker-ut image
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2015-10-15 15:02:26 +01:00
Per Persson
c6ff81fe30
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-15 15:25:52 +02:00
Vincent Demeester
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
Doug Davis
32ead68e9f
Merge pull request #16966 from MHBauer/image-refactor
...
refactor use of container struct from daemon
2015-10-15 07:30:08 -04:00
Madhu Venugopal
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
weiyan
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
Tim Butler
7e59a7ea32
Fix link to Release Process doc in README.md
...
Signed-off-by: Tim Butler <tim.butler.au@gmail.com >
2015-10-15 17:09:57 +10:00
Vincent Demeester
e4dadeed88
Merge pull request #17011 from sunyuan3/TestRunWithBlkioInvalidWeight
...
update TestRunWithBlkioInvalidWeight
2015-10-15 08:34:52 +02:00
Qiang Huang
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
Jeffrey Morgan
5fa41089d1
Merge branch 'master' into upgrade
2015-10-14 21:06:23 -07:00