Commit Graph

66 Commits

Author SHA1 Message Date
24535638bb fix swagger description for DELETE /plugin/{name}
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: e6b2829a7f59b59eb1c3653313bc3c6a56b47b0c
Component: engine
2016-12-26 15:27:59 +01:00
478844dff8 Implement content addressability for plugins
Move plugins to shared distribution stack with images.

Create immutable plugin config that matches schema2 requirements.

Ensure data being pushed is same as pulled/created.

Store distribution artifacts in a blobstore.

Run init layer setup for every plugin start.

Fix breakouts from unsafe file accesses.

Add support for `docker plugin install --alias`

Uses normalized references for default names to avoid collisions when using default hosts/tags.

Some refactoring of the plugin manager to support the change, like removing the singleton manager and adding manager config struct.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 3d86b0c79b16334ce5836c0315e4c310b84c2e17
Component: engine
2016-12-23 13:29:58 -08:00
97f0ab72fa Merge pull request #29527 from allencloud/change-minor-mistake
change minor mistake of spelling
Upstream-commit: b2e348f2a6ab2d5396acf4bb56aea7e49c3e2097
Component: engine
2016-12-21 13:15:00 -05:00
44fa4f8ae7 duplicated the
Signed-off-by: Jie Luo <luo612@zju.edu.cn>

typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix some typos

Signed-off-by: Jie Luo <luo612@zju.edu.cn>
Upstream-commit: ea2dd4b5d0b41552d047814d9e39ddaa3662ab41
Component: engine
2016-12-21 20:16:19 +08:00
209ed6b4ef change minor mistake of spelling
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7c3657065cc04af278a0f1cee99de8c2401ba0ef
Component: engine
2016-12-20 21:05:19 +08:00
4a0adf4beb update response status code for cluster request
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 29d4a7f512e3702ee4a2871dd84e3b24dd26477d
Component: engine
2016-12-19 10:21:10 +08:00
7025bc9a7b Add display name for tags in swagger.yaml
In #29071, we made the tags the correct name for generating types,
at the expense of the menu in the documentation looking good.

ReDoc now has support for tag display names
( https://github.com/Rebilly/ReDoc/pull/152 ), so we can assign
a more human-friendly name to the menu items.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 0caa6c218c89147b2d61a1bbb87c48ad16495a11
Component: engine
2016-12-14 12:00:04 +00:00
252ac47c97 Merge pull request #29216 from allencloud/add-status-code-403-for-services-create
add missing status code 403 for services/create in docs
Upstream-commit: 1bc942597d4a4cfb16493f416eb1c4c36029819b
Component: engine
2016-12-13 12:27:56 +01:00
656f60dc73 plugins: container-rootfs-relative paths
Legacy plugins expect host-relative paths (such as for Volume.Mount).
However, a containerized plugin cannot respond with a host-relative
path. Therefore, this commit modifies new volume plugins' paths in Mount
and List to prepend the container's rootfs path.

This introduces a new PropagatedMount field in the Plugin Config.
When it is set for volume plugins, RootfsPropagation is set to rshared
and the path specified by PropagatedMount is bind-mounted with rshared
prior to launching the container. This is so that the daemon code can
access the paths returned by the plugin from the host mount namespace.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c54b717caf1a55e525ce180bfcb42addd59c6633
Component: engine
2016-12-09 10:16:24 -08:00
1201f538ea add missing status code 403 for services/create in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 19654fd71ec5b9b075863f4623fdb80a955f5187
Component: engine
2016-12-10 01:54:51 +08:00
7f7cf89101 Merge pull request #29213 from yongtang/12072016-typo-swagger-yaml
Fix a couple of incorrect version strings in swagger.yaml
Upstream-commit: 51b422ce6a398b579d97c2c3ae746275bd7204e5
Component: engine
2016-12-07 16:47:49 -08:00
2a1f61f581 Merge pull request #29062 from erxian/refine-api-swagger.yaml-towards-image-create-status-code
refine api swagger.yaml towards image create status code
Upstream-commit: 9468d687ac924db8df95fd8d2bcbe7facafb8c2d
Component: engine
2016-12-07 22:03:54 +01:00
5e6532a1b8 Fix a couple of incorrect version string in swagger.yaml
This fix fixes a couple of incorrect version strings in swagger.yaml
`v1.25` should be `v1.26`. This applies to 1.14 version only.

Also checked 1.13rc and it is fine.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 887c4188f469698938213eddd1babf224cc39737
Component: engine
2016-12-07 08:11:12 -08:00
afe61e5090 refine api swagger.yaml towards image create status code
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 15be050fb307d0da1521767a6f53d9b95429396b
Component: engine
2016-12-07 10:27:40 +08:00
767d2b0a2a Merge pull request #29166 from allencloud/add-403-for-network-create-endpoint
add 403 for endpoint network create
Upstream-commit: f687eb576ff508872213b5639c3bc279db5e6852
Component: engine
2016-12-06 11:47:28 +01:00
92a14fe836 Merge pull request #28535 from yongtang/28497-prune-until
Convert DanglingOnly to Filters for `docker image prune`
Upstream-commit: 745795ef2e0089c5001e5a2fc7ba8c1ab0234857
Component: engine
2016-12-06 11:03:45 +01:00
13d5eb7768 add 403 for endpoint network create
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0d21e24b9fb90ea804ba37af303de7547743ba2b
Component: engine
2016-12-06 14:36:50 +08:00
3c2896d350 Merge pull request #28963 from vieux/refactor_plugin_install
refactor plugin install
Upstream-commit: 1c96879f1e99efc881aaa3480bc6aab18d233475
Component: engine
2016-12-05 12:00:29 -08:00
35037b78fd Convert DanglingOnly to Filters for docker image prune
This fix convert DanglingOnly in ImagesPruneConfig to Filters,
so that it is possible to maintain API compatibility in the future.

Several integration tests have been added to cover changes.

This fix is related to 28497.

A follow up to this PR will be done once this PR is merged.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a6be56b54e871c4e7a6e72881770a64676c27c3c
Component: engine
2016-12-02 20:08:49 -08:00
095013e19b Merge pull request #28349 from allencloud/add-missing-code-in-api-docs
add missing status code of swarm cluster in api 1.24
Upstream-commit: 535db46be508d38a6f9f304a4e57e0c3d1c94af1
Component: engine
2016-12-03 02:04:05 +01:00
791ab405b2 update docs
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 30db51c169497f6d1f6d9517f25c237dd61182de
Component: engine
2016-12-02 15:24:11 -08:00
b4bd0f1abb Use singular tag names in swagger.yaml
This is required to make the type generation put things in the
correct directory, but unfortunately makes the names in the
documentation menu look a bit crap.

I think the best solution would be to add a `x-display-name`
extension to tags to determine how the tags show up in the menu,
rather than it depend on the name of the tag. I shall do this in
a follow-up PR - for now, let's fix the breakage.

Fixes #29045

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 30a9249e1598ec3aa2ddb5885568f40466fa05e8
Component: engine
2016-12-02 14:14:36 +00:00
25a255f4fc add missing status code in api docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9a1f7b6b0bba7bd28c5ae1fabef7ef267e5fbfbd
Component: engine
2016-12-02 11:24:45 +08:00
b852c07238 Make swagger.yaml operationIds consistent
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: bf6a790f00ab96bb8857e3c73502909ee5e36217
Component: engine
2016-11-28 11:24:26 +00:00
5d08ec3b42 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>
Upstream-commit: 54051b18a1d65d67de4cb796350e8924936b6a20
Component: engine
2016-11-28 11:24:26 +00:00
b4894221ee 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>
Upstream-commit: 2aea9ad56b7dc59858abe15b2ae9f60ede294b2f
Component: engine
2016-11-28 11:24:25 +00:00
a5180dfb63 Add intro to swagger.yaml to explain what it's for
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: be52738a2c5a327741da6be7eb95a93a4c214a99
Component: engine
2016-11-28 11:24:25 +00:00
e92b610690 Merge pull request #28727 from cyli/do-not-display-secret-digest
Do not display the digest or size of swarm secrets [1.13] 
Upstream-commit: 22ba220e864d6d30ce1ed56a5461b96dbade844f
Component: engine
2016-11-22 16:44:06 -08:00
e746d79ff3 Merge pull request #28601 from tiborvass/plugin-misc-fixes
Plugin miscellaneous fixes
Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89
Component: engine
2016-11-22 16:12:37 -08:00
00fa4cf151 Update docs to reflect no longer displaying secret digest or size.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: fe127b7eae427bde96b7852ac196825e1c9ea359
Component: engine
2016-11-22 18:18:56 -05:00
dc5227ef8f Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 313502488e8809910127891d8923672baf43a742
Component: engine
2016-11-22 22:47:38 +01:00
051270420d plugins: support for devices
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 53b9b99e5cd19d9913c56c07276a2d4d83b9befd
Component: engine
2016-11-22 09:54:45 -08:00
910c4f2b83 Update swagger.yaml with changes to API
Up to and including 673c5ee559b05adb9ef6e0e1d6135ff83522e38d

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 44c50807c6eadcb2371cc6bf8ba5f66ba9dcbe97
Component: engine
2016-11-22 12:49:38 +00:00
ff7908609b 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>
Upstream-commit: c97f67dbab50f0efbf3c1e6a2862d29c76c9aec1
Component: engine
2016-11-22 12:49:38 +00:00
e5912f7d7e Rename Remote API to Engine API
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: f0d55cd081c6e8ad2a8222c787d54f9aae15723f
Component: engine
2016-11-22 12:49:38 +00:00
14aacd334b 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>
Upstream-commit: 9f239281b1b02ed46f98af1eb39bc9b2165073fa
Component: engine
2016-11-21 14:52:14 -08:00
c21adc5da9 Add HTTP client timeout.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 83ca993c154d56e03d6f95a3f8351c48b3ed3e29
Component: engine
2016-11-21 13:11:40 -08:00
2efd6e2078 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>
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
781fc7e6b4 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>
Upstream-commit: 1d90d7604881e29b71819af9c092d565513aeeec
Component: engine
2016-11-17 11:43:45 -08:00
900e9ed78b Bump API to v1.26
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9182cf1a8dc592c40d25b628a0a3cfa475c8dcea
Component: engine
2016-11-14 14:24:02 -08:00
1bc2b60fd4 update swagger and docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: aef1dec9a6dbf1dcf4b43417c3c5fafda2ede957
Component: engine
2016-11-10 11:58:15 -08:00
88e56044f3 Update misc things in swagger.yaml
Changes to docs/reference/api/docker_remote_api_v1.25.md up to
and including 2d4203222574623b10d94817b9959a08698f516b

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 48af987afe15a6bc3528a45b36c79448abbc8836
Component: engine
2016-11-10 10:10:12 -08:00
496eea904f Add /plugins/{name}/set endpoint to swagger.yaml
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 54c37ecc23e008fa2a7c3c104f87f5e430bf9b29
Component: engine
2016-11-10 10:10:12 -08:00
53ab25ee19 Add prune endpoints to swagger.yaml
Introduced in #26108

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 50a5f3afafadf2b7cfbbf5b7dfba649683608a75
Component: engine
2016-11-10 10:07:25 -08:00
6949dd3368 rename plugin manifest
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 49ca91fbebbea80587ce3c0814bba3b41cce14a0
Component: engine
2016-11-10 00:09:23 -08:00
948055475e Add plugin create functionality.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5b6e1bc9e551ba56b44c3f409fd5d48f8a54ce1d
Component: engine
2016-11-09 15:23:03 -08:00
fffe24070c Fix validation errors in swagger.yaml
- Some objects were missing `type: "object"`
- Some examples had invalid null values (go-swagger validation
  doesn't support x-nullable, so they have just been removed)
- ImageSummary example was out of date
- Removed timeNano because YAML interprets it as a float, not
  a long (sigh)
- Tidy up archive errors

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: e5e1c7feef3e692c21fc2745368bbcae38e02270
Component: engine
2016-11-07 11:03:10 -08:00
b577b180f8 Add logo to swagger.yaml
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: cd0c0d06665c98d7c80cf77760dc5043ab72d466
Component: engine
2016-11-07 11:03:09 -08:00
3e5ee94d25 node rm can be applied on not only active node
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 002262d6f5d9d88b690124b3743db6856fe4f599
Component: engine
2016-11-02 17:22:04 +08:00
2c5782817e Generate ContainerWait response from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 181562c2e54225d6ce737d98b03d3157451a5dbc
Component: engine
2016-10-31 11:19:53 -04:00