beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19233 commits 14 branches 412 tags 338 MiB
Commit graph

19233 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
b972a6e3f8 Merge pull request #17287 from maaquib/16756-integration-cli-experimental-test 
Using checkers assert for integration-cli/docker_cli_experimental_test.go
 2015-10-23 09:44:32 -04:00
Vincent Demeester
60ea37d56f Merge pull request #17299 from sdurrheimer/zsh-completion-network-inspect-multi 
Zsh completion for 'docker network inspect' multiple networks
 2015-10-23 10:49:02 +02:00
Steve Durrheimer
cb93fefa40 Zsh completion for 'docker network inspect' multiple networks 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-23 08:13:33 +02:00
Sebastiaan van Stijn
d023d5a8a2 Merge pull request #17295 from SvenDowideit/two-more-links 
Two more links to fix
 2015-10-22 22:10:33 -07:00
Sven Dowideit
1f9332cd16 Two more links to fix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-23 14:10:43 +10:00
Mohammed Aaqib Ansari
ff91c8ac1a Using checkers assert for integration-cli/docker_cli_experimental_test.go 
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
 2015-10-22 20:29:18 -04:00
Michael Crosby
21aecf62a0 Merge pull request #17284 from calavera/buffer_inspect_template 
Fail when there is an error executing an inspect template.
 2015-10-22 17:06:16 -07:00
David Calavera
3b9c13873a Fail when there is an error executing an inspect template. 
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-22 19:24:50 -04:00
Tibor Vass
37da495d4c Merge pull request #17278 from mavenugo/etchosts 
Vendoring libnetwork & libkv with fixes
 2015-10-22 19:02:02 -04:00
Tibor Vass
4c253ddf20 Merge pull request #17275 from vdemeester/17246-tags-to-repotags 
Use RepoTags & RepoDigest in inspect
 2015-10-22 17:14:49 -04:00
Alessandro Boch
5b53839326 Add integ-test for fixed--cidr == bridge network 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-22 14:12:46 -07:00
Madhu Venugopal
793b20ba09 Vendoring in libkv to be aligned with libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-22 14:12:46 -07:00
Madhu Venugopal
52df87ac2b Vendoring in Libnetwork 
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-22 14:12:46 -07:00
Vincent Demeester
f664f6e4b1 Use RepoTags & RepoDigest in inspect 
To be coherent with /images/json (images command)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-22 23:00:59 +02:00
David Calavera
4816626f3e Merge pull request #17270 from albers/completion-network-ids 
bash completion can be configured to complete network IDs
 2015-10-22 13:37:38 -07:00
David Calavera
2afdc6582b Merge pull request #17274 from aboch/ai 
Turn off discovery when icc == false
 2015-10-22 13:08:31 -07:00
Antonio Murdaca
09cd98462b Merge pull request #17269 from tonistiigi/trust-deprecation-warning 
Show trust variable deprecation warning only if used
 2015-10-22 22:05:29 +02:00
Vincent Demeester
8b198a3bfb Merge pull request #17268 from albers/completion-network-inspect-args 
bash completion for `docker network inspect` supports multiple networks
 2015-10-22 21:18:10 +02:00
Alessandro Boch
20faaaa872 Turn off service discovery when icc==false 
- Turn off built-in service discovery on docker0 bridge
  when icc is false

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-22 12:02:02 -07:00
Tonis Tiigi
dfdee41308 Show trust variable deprecation warning only if used 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-10-22 11:01:30 -07:00
Harald Albers
1598500df8 bash completion can be configured to complete network IDs 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-22 18:58:34 +02:00
Harald Albers
10e485b386 bash completion for docker network inspect supports multiple networks 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-22 17:53:17 +02:00
Sebastiaan van Stijn
bb19575d40 Merge pull request #17259 from SvenDowideit/fix-some-errant-links 
Fix some errant links
 2015-10-22 07:26:15 -07:00
Sven Dowideit
9ed6cec8ff Fix some errant links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-22 20:33:24 +10:00
Vincent Demeester
48fe12af0c Merge pull request #16784 from MHBauer/test-refactor 
use gocheck asserts instead of fatal
 2015-10-22 08:34:50 +02:00
Sebastiaan van Stijn
c6ec33ea8f Merge pull request #17241 from gondor/docs-extend-plugins 
docs: Add Netshare volume plugin to extend/plugins
 2015-10-21 19:24:32 -07:00
Jeremy Unruh
a263709a9b changes from review - which -> that 
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
 2015-10-21 18:42:17 -07:00
Jeremy Unruh
f8c0d4d055 changes from review - move up to conform to alphabetical order 
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
 2015-10-21 18:07:55 -07:00
Brian Goff
fa2bf776a2 Merge pull request #16971 from HuKeping/upgrade-test 
Use checker on integration test when possible
 2015-10-21 20:49:38 -04:00
Hu Keping
710817a71b Use checker on integration test when possible 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-10-22 15:53:17 +08:00
Tianon Gravi
4786ac1ffe Merge pull request #17153 from albers/completion-cp-args 
[Fix 17029] docker cp completion not correct
 2015-10-21 14:58:11 -07:00
Jess Frazelle
697d4c9e72 Merge pull request #17203 from hopkings2008/auth_token 
In NewV2Repository, check the suffix of endpoint.URL and append 'v2' …
 2015-10-21 14:57:05 -07:00
Vincent Demeester
ab22fe0f7c Merge pull request #17055 from daehyeok/parse_utf8 
ProcessWord support UTF-8
 2015-10-21 23:42:50 +02:00
Jess Frazelle
af6743a6c6 Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest 
RPM change install location of Fish completions
 2015-10-21 14:36:50 -07:00
Tibor Vass
e319b122d3 Merge pull request #17227 from aaronlehmann/layer-compression 
Fix layer compression regression
 2015-10-21 17:32:58 -04:00
Jess Frazelle
bf8ba3d0c9 Merge pull request #16908 from brahmaroutu/skip_oom_gccgo 
Skipping two tests when running with GCCGO (CI)
 2015-10-21 14:01:59 -07:00
Jess Frazelle
08fb495975 Merge pull request #17145 from thaJeztah/deb-add-fish-completions 
deb: add fish completions
 2015-10-21 13:58:22 -07:00
Jess Frazelle
70af70aa0b Merge pull request #17220 from calavera/fix_double_removal 
Do not fail when a container is being removed and we request its delete again.
 2015-10-21 13:57:16 -07:00
Jess Frazelle
f33678d1bf Merge pull request #17251 from tiborvass/fix-release-script 
release: fix bash bug in script
 2015-10-21 13:08:50 -07:00
Tibor Vass
420e07cc2c release: fix bash bug in script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-21 16:02:14 -04:00
Tibor Vass
56ef47e881 Merge pull request #16890 from runcom/perf-boost 
rmi and build cache miss performance improvements
 2015-10-21 16:00:25 -04:00
Phil Estes
94a16c81f4 Merge pull request #17245 from dhiltgen/discovery_tls 
Wire up libnetwork with TLS discovery options
 2015-10-21 15:20:24 -04:00
David Calavera
8247eff8a8 Merge pull request #17213 from calavera/volume_driver_validate_name 
Validate volume names for the local driver.
 2015-10-21 11:48:54 -07:00
David Calavera
678acbcb3f Merge pull request #16992 from burke/fix-mqueue 
Fix --ipc=host dependency on /dev/mqueue existing
 2015-10-21 11:25:37 -07:00
Sebastiaan van Stijn
9f031f70ce Merge pull request #17218 from vdemeester/17023-network-multiple-inspect 
Add support for multiple network in inspect
 2015-10-21 11:09:02 -07:00
Tibor Vass
6a7c38a57d Merge pull request #16940 from coolljt0725/default_tls_host 
Make default tls host work
 2015-10-21 14:02:22 -04:00
Srini Brahmaroutu
dc813c7d13 Skipping two tests when running with GCCGO (CI) 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-10-21 17:53:59 +00:00
Tibor Vass
10430fd334 Merge pull request #17179 from tonistiigi/17178-dont-overwrite-layer-checksum 
Don’t overwrite layer checksum on push
 2015-10-21 13:42:59 -04:00
Sebastiaan van Stijn
492945235b Merge pull request #17136 from gesellix/change-route-volume-create 
rename `POST /volumes` to `POST /volumes/create`
 2015-10-21 10:21:27 -07:00
Daniel Hiltgen
10e7806984 Wire up libnetwork with TLS discovery options 
This change exposes the TLS configuration settings to libnetwork so it can
communicate with a key/value store that has been set up with mutual TLS.

TLS options were introduced with https://github.com/docker/docker/pull/16644
Libnetwork support was introduced with https://github.com/docker/libnetwork/pull/602

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2015-10-21 09:38:58 -07:00