p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,615 Commits 2 Branches 295 Tags
25481985f35d7aaa742e059dc573db72dc3773e6
Commit Graph

2564 Commits

Author SHA1 Message Date
Vincent Demeester
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
erxian
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
Sebastiaan van Stijn
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
Vincent Demeester
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
allencloud
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
Brian Goff
983cf6d582 Merge pull request #29123 from vdemeester/29116-compose-to-swarm-logging 
Handle logging in compose to swarm
Upstream-commit: 1f09d68a6e98b8b20ff4e877835bc798cfdb0100
Component: engine
 2016-12-05 20:39:08 -05:00
Tibor Vass
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
unclejack
a7d2aca6a3 api/types/container,client: gofmt 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: c1ce63b17bde361107900d7b58da6d13fd309734
Component: engine
 2016-12-05 17:00:36 +02:00
Vincent Demeester
4ef31d0696 Handle logging in compose to swarm 
Logging configuration was completely ignore when deploy a compose file
to swarm. This fixes it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 806cc1e0f815d7c4e4b7bd4fa537e3d4c3535e23
Component: engine
 2016-12-05 15:18:36 +01:00
Yong Tang
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
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
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