Karol Duleba
74900edbf8
Remove CLI specific information for API error messages. Issue #17147
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com >
2015-12-03 15:23:07 +00:00
Sebastiaan van Stijn
a2120e5ba3
Address review comments.
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-03 16:07:54 +01:00
Ben Firshman
fe3ec3f77f
Add docs and man page entry for --volume-driver
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-12-03 16:02:20 +01:00
Jean-Laurent de Morlhon
3f0625fbac
Merge pull request #2487 from frapposelli/vsphere-path-fix
...
Fix for vSphere driver boot2docker ISO issues
2015-12-03 15:33:25 +01:00
Wen Cheng Ma
a947377297
Update the "Manually network" section with detailed info in container-basics
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2015-12-03 22:32:02 +08:00
Liu Hua
451f751773
fix Put without Get in aufs
...
this Patch is ported from 3916561619
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-12-03 22:22:25 +08:00
Liu Hua
f7bdb97357
Fix Put without Get in devicemapper
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-12-03 22:22:25 +08:00
Thomas Recloux
0408378332
AWS : update default images to ubuntu 15.10
...
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com >
2015-12-03 14:50:21 +01:00
Fabio Rapposelli
2dcfcf2b06
Fix for vSphere driver boot2docker ISO issues
...
Fixes #2279 #2060
Signed-off-by: Fabio Rapposelli <fabio@vmware.com >
2015-12-03 07:24:26 -05:00
Sven Dowideit
925ac57d6c
Small fixes found by linkchecker
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-12-03 21:38:37 +10:00
Sven Dowideit
7d0d94814b
Small doc fixes found by the linkchecker
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-12-03 21:26:41 +10:00
dongmx
ce524e1740
Swarm container net should be host. If use bridge, sometime container ip addresses conflict.
...
Signed-off-by: dongmx <dongmx@xueqiu.com >
2015-12-03 19:11:34 +08:00
Andrea Luzzardi
f1155ca431
Enable profiling over HTTP in debug mode
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-12-03 03:01:05 -08:00
dongmx
e799388e85
issue #2485 , If a permanent IP address and hostname has alread in /etc/hosts
...
Signed-off-by: dongmx <dongmx@xueqiu.com >
2015-12-03 18:59:40 +08:00
Antonio Murdaca
3662f58083
daemon: remove private func config()
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-12-03 11:46:53 +01:00
David Gageot
e26c485013
Vendor samalba.dockerclient
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-03 10:56:25 +01:00
David Gageot
029b39ee62
Merge pull request #2141 from janeczku/digitalocean-userdata
...
Digitalocean driver: Support for creating Droplets with Cloud-init User Data
2015-12-03 10:53:06 +01:00
David Gageot
fc0c883957
Merge pull request #2482 from askb/fix_test
...
Now the returned `err` is being checked to ensure its `Nil`
2015-12-03 10:46:31 +01:00
Alexandre Beslic
ed0b11e506
Merge pull request #1490 from jimmyxian/fix-retry-time
...
Fix retry time when check disconnect events
2015-12-03 01:02:06 -08:00
Xian Chaobo
19c0c0e6f9
integration: fix retry time when check disconnect events
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-12-03 16:53:24 +08:00
Xian Chaobo
913073ff5f
Merge pull request #1489 from abronan/fix_ci_kernel_memory
...
Integration: fix --kernel-memory value set too low
2015-12-03 16:48:24 +08:00
Alexandre Beslic
44d96a6185
integration: fix --kernel-memory value set too low
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-12-03 00:28:00 -08:00
Andrew Meredith
6357b02236
Escape dollar signs
...
If this example was copied and pasted, the shell would try to interpolate `$upstream_http_docker_distribution_api_version` and `$docker_distribution_api_version`.
Signed-off-by: Andrew Meredith <andymeredith@gmail.com >
2015-12-02 23:45:09 -07:00
Victor Vieux
a17f182026
add mesos
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-12-02 22:16:00 -08:00
Alexandre Beslic
2ac860e335
integration: wait for agents to be registered on the Manager before running tests
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-12-02 22:09:17 -08:00
jake-low
e760c42ae0
Stop warning about ".yaml" extension
...
".yaml" is the preferred extension according to http://www.yaml.org/faq.html
Signed-off-by: jake-low <jakelow42@gmail.com >
2015-12-02 21:45:36 -08:00
Victor Vieux
f73ec80548
default back to aufs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-12-02 20:45:15 -08:00
Alexander Morozov
1475f567cb
Merge pull request #18375 from vbatts/tar-split_update
...
vendor: update tar-split to v0.9.11
2015-12-02 20:25:07 -08:00
Anil Belur
2d71dc77dc
This is a follow up for PR #2473
...
Now the returned `err` is being checked to ensure its `Nil`
Signed-off-by: Anil Belur <askb23@gmail.com >
2015-12-03 09:13:44 +05:30
Dong Chen
10986a6038
Use ioutil.NopCloser to make copy of http.request.Body.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2015-12-02 18:46:16 -08:00
Dong Chen
22ff794c2e
Route network connect/disconnect request to the right engine.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2015-12-02 18:46:16 -08:00
Stephen Day
b66bb1287c
Merge pull request #1227 from stevvooe/walk-sorted
...
storage: enforce sorted traversal during Walk
2015-12-02 18:37:44 -08:00
Patrick Devine
b084c77c70
Clarify pagination for catalog API endpoint
...
This change clarifies the way the catalog endpoint returns results
when pagination was not explicitly requested.
Signed-off-by: Patrick Devine <patrick.devine@docker.com >
2015-12-02 18:02:51 -08:00
Daniel Nephin
81f0e72bd2
Move service sorting to config package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
da27f8e7e2
Remove unnecessary intermediate variables in get_container_host_config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
8572d50903
Move volume parsing to config.types module
...
This removes the last of the old service.ConfigError
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
5d39813e1b
Fixes #2008 - re-use list_or_dict schema for all the types
...
At the same time, moves extra_hosts validation to the config module.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
b19315b57e
Move restart spec to the config.types module.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
e549875e89
Move parsing of volumes_from to the last step of config parsing.
...
Includes creating a new compose.config.types module for all the domain objects.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
7e21b05f05
Remove project name validation
...
project name is already normalized to a valid name before creating a service.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
bea2072b95
Add the git sha to version output
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
3b6cc7a7bb
Add missing assert and autospec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
a264470cc0
Make sure we always have the latest busybox image, so that build --pull tests don't flake.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
844e2c3d26
Fix use case link in readme.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
210a14cf28
Add note about required pip version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Brandon Burton
9ce4024951
Fixing matrix include so os: linux goes to trusty
...
Signed-off-by: Brandon Burton <brandon@inatree.org >
2015-12-02 17:31:48 -08:00
Daniel Nephin
8fb6fb7b19
Fix env_file and environment when used with extends.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
83760d0e9e
Handle both SIGINT and SIGTERM for docker-compose run.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
be5b7b6f0e
Handle both SIGINT and SIGTERM for docker-compose up.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00
Daniel Nephin
e5a02d3052
Fix extra warnings on masked volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-02 17:31:48 -08:00