toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,187 Commits 3 Branches 295 Tags
42c8c64090db3e463a17c84ffd2aacbf696d6b9f
Commit Graph
2956 Commits
Author SHA1 Message Date
Brian Goff c0aa09b760 Merge pull request #28988 from vdemeester/28985-dont-validate-hostname 
Remove hostname validation as it seems to break users
Upstream-commit: 3cb310c21049f652dd00d20899cb1ece1ee9aa8f
Component: engine
 2016-12-02 21:16:56 -05:00
Sebastiaan van Stijn 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
Victor Vieux 791ab405b2 update docs 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 30db51c169497f6d1f6d9517f25c237dd61182de
Component: engine
 2016-12-02 15:24:11 -08:00
Victor Vieux a9f58f81fd refactor plugin install 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: fa3b61a28f55d84afbbb978785ce9632123d12fa
Component: engine
 2016-12-02 15:23:08 -08:00
Ben Firshman 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
allencloud 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
Aaron Lehmann a68666e468 api: Hide UpdateStatus when it is not present 
When UpdateStatus was not present, the empty values of the timestamps
would be present:

        "UpdateStatus": {
            "StartedAt": "0001-01-01T00:00:00Z",
            "CompletedAt": "0001-01-01T00:00:00Z"
        }

To fix this, make the timestamps pointers, so they can be set to nil
when they should not be shown.

Also make UpdateStatus itself a pointer, so an empty object does not
show up when there is no UpdateStatus.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0e70d96a6813704498a3ce9cc2786648c84daa3a
Component: engine
 2016-12-01 15:08:41 -08:00
Sebastiaan van Stijn c2f7699391 Merge pull request #28917 from erxian/correct-secret-remove-http-return-code 
correct the http return code of secret remove
Upstream-commit: 457d562af128a765b48389681399903ca0e679cf
Component: engine
 2016-11-30 22:47:28 +01:00
Vincent Demeester c46ac53d0a Remove hostname validation as it seems to break users 
Validation is still done by swarmkit on the service side.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ef39256dfb711f8382a5c021b85d6c7d613282b0
Component: engine
 2016-11-30 19:22:07 +01:00
Sebastiaan van Stijn 0a639f6e9e Merge pull request #28840 from bfirsh/2016-11-25-api-docs 
Updates to swagger.yaml and API documentation
Upstream-commit: 643b1c0175206291d8850a87608912d906009a71
Component: engine
 2016-11-30 15:49:25 +01:00
erxian cfe1223c49 correct the http return code of secret remove 
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 21768933fbf61d1481e303ee7a3a5ecc57fc3838
Component: engine
 2016-11-30 19:45:45 +08:00
Dong Chen 0e6be54ce9 Fix network attachable option. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: abcb699ad175859ee192388c001f55df5f88e8cd
Component: engine
 2016-11-28 16:54:56 -08:00
Vincent Demeester f4c6d41e59 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>
Upstream-commit: c6e31454ba2f053bc6831651663cf538d142afaa
Component: engine
 2016-11-28 22:15:50 +01:00
Vincent Demeester 50f0cb2e24 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>
Upstream-commit: e517d7975eb7e4dec8326b181e5fcc81b7871575
Component: engine
 2016-11-28 14:14:50 +01:00
Ben Firshman 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
Ben Firshman 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
Ben Firshman 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
Ben Firshman 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
Victor Vieux 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
Anusha Ragunathan 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
cyli 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
cyli 2e3fe52bff Do not display the digest or size of swarm secrets 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 2c0613540a25d45069d142542e572bb6338e4155
Component: engine
 2016-11-22 18:13:27 -05:00
Victor Vieux 08d6a8b3d7 Merge pull request #28691 from aluzzardi/service-logs-no-follow 
[experimental] service logs: Support no-follow mode
Upstream-commit: c025d5650433de503f0b415b7b5e120cfcd35b17
Component: engine
 2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn 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
Tibor Vass 419cdb27d7 Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: 677e14643c79184ca9d8123dd3e91e0444b1cac3
Component: engine
 2016-11-22 10:17:10 -08:00
Victor Vieux 3aef405305 Merge pull request #28529 from allencloud/update-secret-create-url 
fix secret create url for consistency
Upstream-commit: 772a423e08d6da2dbfebb22382270ea9d075a9a9
Component: engine
 2016-11-22 09:55:17 -08:00
Tibor Vass 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
Ben Firshman 8251da003b Add documentation for working on Engine API 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 109c54c481c7dafe88b622b87c0c7c172fed5ea1
Component: engine
 2016-11-22 16:46:57 +00:00
Ben Firshman 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
Ben Firshman 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
Ben Firshman 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
Vincent Demeester b123ea8afd Merge pull request #28651 from YuPengZTE/devMD002 
First header should be a top level header
Upstream-commit: 48c3df015d3118b92032b7bdbf105b5e7617720d
Component: engine
 2016-11-22 13:11:37 +01:00
yupeng 5f4c3b65c6 hack/swagger-gen.sh is not exist, it should be /hack/generate-swagger-api.sh 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: c471b7f2435f2cfa84d42876c35a04097593e864
Component: engine
 2016-11-22 16:32:32 +08:00
Andrea Luzzardi abd795e582 service logs: Support no-follow mode 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: c2d435e4f05d262aaa3d4d5cc2fe8965377eebdf
Component: engine
 2016-11-21 18:02:13 -08:00
yupeng 163c2e9b09 First header should be a top level header 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 1e65db4206ba89af24400fbf9047b25ec98cfd02
Component: engine
 2016-11-22 09:33:21 +08:00
Tibor Vass 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
Victor Vieux 12ac08ce0b Merge pull request #28504 from runcom/fix-info-route-secopt 
api: types: do not remove old SecurityOptions struct
Upstream-commit: 3a6829257e970771a4be99783b93a803946443df
Component: engine
 2016-11-21 13:55:07 -08:00
Anusha Ragunathan 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
Vincent Demeester f8729bb9ff Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
Upstream-commit: 05963010ee2aa363bcbd6d925918a46dba02fd7d
Component: engine
 2016-11-21 21:40:01 +01:00
Vincent Demeester f3f3b8320e Merge pull request #28466 from miaoyq/update-a-var-type 
The type of 'ExportdPorts' should be 'nat.PortSet'
Upstream-commit: e349d3d330a419015e73f971acedb960be0cc24d
Component: engine
 2016-11-21 20:23:10 +01:00
Antonio Murdaca 36b43dcc24 api: types: keep info.SecurityOptions a string slice 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 514ca09426e5d023753101ffa6ac3a21b0e0efb5
Component: engine
 2016-11-19 13:21:16 +01:00
Doug Davis 40d5a75060 Merge pull request #28611 from vieux/fix_golint 
fix a few golint errors
Upstream-commit: 96f50e9b7087bad25cb38e2985c26b509be0c403
Component: engine
 2016-11-19 07:16:44 -05:00
Victor Vieux 68a4c9aae2 Merge pull request #28524 from aluzzardi/experimental-routes 
router: Return explicit error rather than 404 for experimental.
Upstream-commit: c3fab6d47345f0d79efd88d0ea0495dd70f0e9f5
Component: engine
 2016-11-18 18:49:15 -08:00
Victor Vieux c148947fe6 fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
 2016-11-18 18:32:02 -08:00
Aaron Lehmann 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
allencloud 5d1129c013 fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1f039a66ac55c937f5dfa281a04009626d191f83
Component: engine
 2016-11-18 15:51:36 +08:00
allencloud b0d2847574 update secret create url for consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 86d768284303665bf137ac4766a623167a605c76
Component: engine
 2016-11-18 10:18:21 +08:00
Andrea Luzzardi 84fb1a0844 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>
Upstream-commit: 3976a33c1a578827da3726bec3927cc058fe326a
Component: engine
 2016-11-17 15:51:47 -08:00
Michael Crosby ba96408498 Merge pull request #28532 from stevvooe/disabled-swarm-service-unavailable 
api/server/httputils: service unavailable for disable swarm
Upstream-commit: bbac9eeae68a2d1084961dc3b0adc4e9e729647c
Component: engine
 2016-11-17 15:16:23 -08:00
Brian Goff e3739bc965 Merge pull request #28383 from zteBill/fix-useless-var 
Remove needless var
Upstream-commit: 6969c98a3c9ca90616d88c6a57543ccd5724e6fb
Component: engine
 2016-11-17 16:18:07 -05:00