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

2545 commits

Author SHA1 Message Date
Sebastiaan van Stijn
643b1c0175 Merge pull request #28840 from bfirsh/2016-11-25-api-docs 
Updates to swagger.yaml and API documentation
 2016-11-30 15:49:25 +01:00
Dong Chen
abcb699ad1 Fix network attachable option. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-11-28 16:54:56 -08:00
Vincent Demeester
c6e31454ba
Fixes ImageList to be retro-compatible with older API 
Make sure current client code can talk for ImageList can still talk to
older daemon.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 22:15:50 +01:00
Vincent Demeester
e517d7975e
AcceptedFilters in router/network/filter.go should not be exported 
It's not used elsewhere and doesn't need to be exported.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 14:14:50 +01:00
Ben Firshman
bf6a790f00
Make swagger.yaml operationIds consistent 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:26 +00:00
Ben Firshman
54051b18a1
Make docs URLs in swagger.yaml absolute 
This makes the swagger.yaml useful outside of the documentation.
For background:
https://github.com/docker/docker.github.io/pull/606#issuecomment-261389645

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:26 +00:00
Ben Firshman
2aea9ad56b
Improve tags in swagger.yaml 
- Consistent naming (plural, etc)
- Add section descriptions
- Add docs in swagger.yaml about how to maintain them

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:25 +00:00
Ben Firshman
be52738a2c
Add intro to swagger.yaml to explain what it's for 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:25 +00:00
Victor Vieux
22ba220e86 Merge pull request #28727 from cyli/do-not-display-secret-digest 
Do not display the digest or size of swarm secrets [1.13]
 2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes 
Plugin miscellaneous fixes
 2016-11-22 16:12:37 -08:00
cyli
fe127b7eae Update docs to reflect no longer displaying secret digest or size. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:18:56 -05:00
cyli
2c0613540a Do not display the digest or size of swarm secrets 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:13:27 -05:00
Victor Vieux
c025d56504 Merge pull request #28691 from aluzzardi/service-logs-no-follow 
[experimental] service logs: Support no-follow mode
 2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn
313502488e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs 
Prepare docs and Swagger definition for automatically generated API docs
 2016-11-22 22:47:38 +01:00
Tibor Vass
677e14643c Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
 2016-11-22 10:17:10 -08:00
Victor Vieux
772a423e08 Merge pull request #28529 from allencloud/update-secret-create-url 
fix secret create url for consistency
 2016-11-22 09:55:17 -08:00
Tibor Vass
53b9b99e5c plugins: support for devices 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-11-22 09:54:45 -08:00
Ben Firshman
109c54c481
Add documentation for working on Engine API 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 16:46:57 +00:00
Ben Firshman
44c50807c6
Update swagger.yaml with changes to API 
Up to and including 673c5ee559

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Ben Firshman
c97f67dbab
Add version information to swagger.yaml 
- Tidied up copy
- API version is now mandatory
- Links to previous API versions

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Ben Firshman
f0d55cd081
Rename Remote API to Engine API 
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Vincent Demeester
48c3df015d Merge pull request #28651 from YuPengZTE/devMD002 
First header should be a top level header
 2016-11-22 13:11:37 +01:00
yupeng
c471b7f243 hack/swagger-gen.sh is not exist, it should be /hack/generate-swagger-api.sh 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-22 16:32:32 +08:00
Andrea Luzzardi
c2d435e4f0 service logs: Support no-follow mode 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-21 18:02:13 -08:00
yupeng
1e65db4206 First header should be a top level header 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-22 09:33:21 +08:00
Tibor Vass
9f239281b1 plugins: linux capabilities and device creation 
In the plugin manifest, Capabilities has been moved to
Linux.Capabilities to avoid confusion with Interface.Types[i].Capability

A DeviceCreation boolean has also been added to the manifest. This could
be changed in the future to be specific to a major number.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-11-21 14:52:14 -08:00
Victor Vieux
3a6829257e Merge pull request #28504 from runcom/fix-info-route-secopt 
api: types: do not remove old SecurityOptions struct
 2016-11-21 13:55:07 -08:00
Anusha Ragunathan
83ca993c15 Add HTTP client timeout. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-21 13:11:40 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
 2016-11-21 21:40:01 +01:00
Vincent Demeester
e349d3d330 Merge pull request #28466 from miaoyq/update-a-var-type 
The type of 'ExportdPorts' should be 'nat.PortSet'
 2016-11-21 20:23:10 +01:00
Antonio Murdaca
514ca09426
api: types: keep info.SecurityOptions a string slice 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-19 13:21:16 +01:00
Doug Davis
96f50e9b70 Merge pull request #28611 from vieux/fix_golint 
fix a few golint errors
 2016-11-19 07:16:44 -05:00
Victor Vieux
c3fab6d473 Merge pull request #28524 from aluzzardi/experimental-routes 
router: Return explicit error rather than 404 for experimental.
 2016-11-18 18:49:15 -08:00
Victor Vieux
9c559e6d0b fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 18:32:02 -08:00
Aaron Lehmann
948e60691e Return warnings from service create and service update when digest pinning fails 
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-18 09:31:31 -08:00
allencloud
1f039a66ac fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 15:51:36 +08:00
allencloud
86d7682843 update secret create url for consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 10:18:21 +08:00
Andrea Luzzardi
3976a33c1a router: Return explicit error rather than 404 for experimental. 
Instead of not adding experimental routes at all, fail with an explicit
message if the daemon is not running in experimental mode.

Added the `router.Experimental` which does this automatically.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-17 15:51:47 -08:00
Michael Crosby
bbac9eeae6 Merge pull request #28532 from stevvooe/disabled-swarm-service-unavailable 
api/server/httputils: service unavailable for disable swarm
 2016-11-17 15:16:23 -08:00
Brian Goff
6969c98a3c Merge pull request #28383 from zteBill/fix-useless-var 
Remove needless var
 2016-11-17 16:18:07 -05:00
Evan Hazlett
bebd472e40 do not force target type for secret references 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use secret store interface instead of embedded secret data into container

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-17 15:49:02 -05:00
Stephen J Day
1d90d76048
api/server/httputils: service unavailable for disable swarm 
When swarm-mode is disabled, we need to return an error indicating this.
406 was chosen for the "Not Acceptable" verbiage, but this code has
specific semantics in relation to the `Accept` header, which aren't
applicable here.

We now use a 503 for this case. While it is not a perfect match, it does
make it clear that the particular "service" (read: API endpoint) is not
available. The body of the message provides the user with enough
information to take action on it by enabling swarm-mode and ensuring the
service is available.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-11-17 11:43:45 -08:00
zteBill
4b3a1bbda5 make each return explicitly 
Signed-off-by: zteBill <bi.zhenkun@zte.com.cn>
 2016-11-17 17:13:25 +08:00
Vincent Demeester
465c0484dc Merge pull request #28521 from aaronlehmann/omitempty 
api: Remove omitempty tag on Parallelism
 2016-11-17 09:05:29 +01:00
Victor Vieux
e93bd7b8ce Merge pull request #28530 from stevvooe/derandom-error-codes 
api/server/httputils: ensure consistent status code
 2016-11-16 23:52:52 -08:00
Stephen J Day
3484e02590
api/server/httputils: ensure consistent status code 
Error code resolution is powered by string matching. Not the greatest
thing in the world and I hope no one is proud of this code, but it
works. However, because a map is used, the iteration order of the map is
random, such that if an error matches two of the snippets, it may return
a different error code depending on the seed of the hashmap. This change
converts it to use a slice instead.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-11-16 18:58:55 -08:00
Aaron Lehmann
d8b8b12994 api: Remove omitempty tag on Parallelism 
It doesn't make sense to use omitempty here. 0 is a meaningful value and
it's different from the default. If someone sets Parallelism to 0, we
want to show that Parallelism is 0, not hide the field.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-16 16:21:25 -08:00
Sebastiaan van Stijn
3f9dc02135 Merge pull request #28322 from Microsoft/jjh/api1.26 
Bump API to v1.26
 2016-11-17 00:01:46 +01:00
Yanqiang Miao
c44c542d95 The type of 'ExportdPorts' should be 'nat.PortSet' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-16 13:36:11 +08:00
John Howard
9182cf1a8d Bump API to v1.26 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-14 14:24:02 -08:00