Commit Graph

121 Commits

Author SHA1 Message Date
808190cd07 Merge pull request #28963 from vieux/refactor_plugin_install
refactor plugin install
Upstream-commit: cff6855751
Component: cli
2016-12-05 12:00:29 -08:00
c2a0302e05 api/types/container,client: gofmt
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: ee4988f4b2
Component: cli
2016-12-05 17:00:36 +02:00
cc2b3e61e8 refactor plugin install
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 7520858943
Component: cli
2016-12-02 15:23:08 -08:00
78311eeeaf Support plugins in docker inspect
This fix tries to address the proposal raised in 28946
to support plugins in `docker inspect`.

The command `docker inspect` already supports
"container", "image", "node", "network", "service", "volume", "task".
However, `--type plugin` is not supported yet at the moment.

This fix address this issue by adding the support of `--type plugin`
for `docker inspect`.

An additional integration test has been added to cover the changes.

This fix fixes 28946.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 47f0fde2cf
Component: cli
2016-12-02 11:33:29 -08:00
0f0f90ed78 Merge pull request #29026 from yuexiao-wang/fix-client-test
Optimize the log info for client test
Upstream-commit: f11c4529cb
Component: cli
2016-12-01 16:30:07 +01:00
1a100e2388 Fix the inconsistent function name for client
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 7673aad223
Component: cli
2016-12-02 04:18:02 +08:00
d37ef3a01b Optimize the log info for client test
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9a9c077e63
Component: cli
2016-12-02 03:32:04 +08:00
77042515db client: add accessor methods for client.customHTTPHeaders
Added two methods:

 - *Client.CustomHTTPHeaders() map[string]string
 - *Client.SetCustomHTTPHeaders(headers map[string]string)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 232944cc15
Component: cli
2016-11-29 09:02:52 +00:00
90f36d5983 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: 32f410cd35
Component: cli
2016-11-28 22:15:50 +01:00
6508dc209e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 36a1664cd4
Component: cli
2016-11-22 22:47:38 +01:00
800e889b8c Merge pull request #28595 from anusha-ragunathan/plugin_timeout
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: 7cc80114de
Component: cli
2016-11-22 10:17:10 -08:00
93af8ecaa8 Merge pull request #28529 from allencloud/update-secret-create-url
fix secret create url for consistency
Upstream-commit: 4d87ef4432
Component: cli
2016-11-22 09:55:17 -08:00
8dd51982bd 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: 9c9ae79e64
Component: cli
2016-11-22 12:49:38 +00:00
4ded4ce547 Merge pull request #28651 from YuPengZTE/devMD002
First header should be a top level header
Upstream-commit: 2a9b8737a5
Component: cli
2016-11-22 13:11:37 +01:00
88bc0e036b Merge pull request #28659 from xuzhenglun/master
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: 800c0e20ce
Component: cli
2016-11-22 13:01:05 +01:00
d9eae8f9b0 fix incorrect ErrConnectFailed comparison
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: b35205ed12
Component: cli
2016-11-22 10:42:55 +08:00
e3969c2cea First header should be a top level header
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 4e4541540f
Component: cli
2016-11-22 09:33:21 +08:00
3115012a80 Merge pull request #28504 from runcom/fix-info-route-secopt
api: types: do not remove old SecurityOptions struct
Upstream-commit: e6dc69b4ee
Component: cli
2016-11-21 13:55:07 -08:00
d8c70a7d8d Add HTTP client timeout.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 43e89b5387
Component: cli
2016-11-21 13:11:40 -08:00
cf98c0f30e Bugfix: set cli.manualOverride when env var not empty
If env var "DOCKER_API_VERSION" is specified by user, we'll set
`cli.manualOverride`, before this, this field is always true due to
wrong logic.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 20ded0afd9
Component: cli
2016-11-21 17:31:46 +08:00
3c47b1cb86 api: types: keep info.SecurityOptions a string slice
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: b4fe4fb42b
Component: cli
2016-11-19 13:21:16 +01:00
d5535f5557 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: b58a973b18
Component: cli
2016-11-18 09:31:31 -08:00
002f2aed72 Merge pull request #28540 from lixiaobing10051267/masterNewContainerId
expected new_container_id while testing ContainerCommit
Upstream-commit: e360a30a41
Component: cli
2016-11-18 12:13:30 +01:00
33b6dcd341 expected new_container_id while testing ContainerCommit
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: e98be4c62f
Component: cli
2016-11-18 10:21:04 +08:00
f186f103bc update secret create url for consistency
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 42788cad9c
Component: cli
2016-11-18 10:18:21 +08:00
49392d9004 Merge pull request #28512 from anusha-ragunathan/fix_enable
Cleanup after plugin install.
Upstream-commit: d9a5f6c80e
Component: cli
2016-11-17 10:16:47 +01:00
021e1a51ce Merge pull request #28322 from Microsoft/jjh/api1.26
Bump API to v1.26
Upstream-commit: 6e6b37b0a2
Component: cli
2016-11-17 00:01:46 +01:00
656a0c42be Cleanup after plugin install.
During error cases, we dont cleanup correctly. This commit takes care
of removing the plugin, if there are errors after the pull passed. It
also shuts down the plugin, if there are errors after the plugin in the
enable path.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 4749582510
Component: cli
2016-11-16 14:45:51 -08:00
b930443d65 Bump API to v1.26
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b5b095c01a
Component: cli
2016-11-14 14:24:02 -08:00
27d5ed0e7a fix t.Errorf to t.Error in serveral _test.go
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
Upstream-commit: 2eb3e2ce0f
Component: cli
2016-11-14 17:54:43 +08:00
608f23172f Add reference filter and deprecated filter param…
… for `docker images`.

This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 85e72de60c
Component: cli
2016-11-11 15:34:01 +01:00
75859b8297 Merge pull request #28217 from Microsoft/jjh/373engineapifollowup
Tidy GetDockerOS() function
Upstream-commit: dc4d7a83ff
Component: cli
2016-11-10 18:57:56 -08:00
a867bf217d move plugins out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 1f6f5bec49
Component: cli
2016-11-10 15:51:32 -08:00
915d9ab391 api: Service Logs support
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: f88c041647
Component: cli
2016-11-10 13:46:02 -08:00
557c959fcf Merge pull request #28164 from anusha-ragunathan/plugin-build
Add plugin create functionality.
Upstream-commit: 98408aa5c8
Component: cli
2016-11-09 17:49:51 -08:00
b9674ce3e8 Add unlock key rotation
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: de1b8f9439
Component: cli
2016-11-09 16:09:01 -08:00
50e796a0be Revise swarm init/update flags, add unlocking capability
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a8dc2ff916
Component: cli
2016-11-09 16:09:00 -08:00
798fd349f4 Add support for swarm init lock and swarm unlock
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: dd81022c23
Component: cli
2016-11-09 16:09:00 -08:00
7c006ff288 Add plugin create functionality.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 3d7a95829e
Component: cli
2016-11-09 15:23:03 -08:00
4931dad259 Tidy GetDockerOS() function
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c941751fb2
Component: cli
2016-11-09 14:46:53 -08:00
8788cdab0b review updates
- use Filters instead of Filter for secret list
- UID, GID -> string
- getSecrets -> getSecretsByName
- updated test case for secrets with better source
- use golang.org/x/context instead of context
- for grpc conversion allocate with make
- check for nil with task.Spec.GetContainer()

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: ab6c38e014
Component: cli
2016-11-09 14:27:45 -05:00
719ce57b9e more review updates
- use /secrets for swarm secret create route
- do not specify omitempty for secret and secret reference
- simplify lookup for secret ids
- do not use pointer for secret grpc conversion

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 548728bb84
Component: cli
2016-11-09 14:27:43 -05:00
d1a4dc8e90 secrets: secret management for swarm
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use tmpfs for swarm secrets

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: inject secrets from swarm secret store

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: use secret names in cli for service create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

switch to use mounts instead of volumes

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: use ehazlett swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: finish secret update

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 72ff77999c
Component: cli
2016-11-09 14:27:43 -05:00
10e4d1c58c always add but hide experimental cmds and flags
Signed-off-by: Victor Vieux <vieux@docker.com>

update cobra and use Tags

Signed-off-by: Victor Vieux <vieux@docker.com>

allow client to talk to an older server

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4f63bfb619
Component: cli
2016-11-08 04:55:27 -08:00
d8d857d3a5 support settings in docker plugins install
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 3f7264473d
Component: cli
2016-11-07 22:49:22 -08:00
1fb5d053e7 client: bump default version to v1.25
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 58c2d938dd
Component: cli
2016-11-07 10:01:28 +01:00
832f1884c2 Merge pull request #28065 from lixiaobing10051267/masterServerEror
add error information to distinguish different test scene
Upstream-commit: c910d3825b
Component: cli
2016-11-07 09:16:16 +01:00
792c7e5a54 add error information to distinguish different test scene
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: a98c89b310
Component: cli
2016-11-04 17:16:11 +08:00
f70d6e5d9c daemon: add a flag to override the default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 485bb69238
Component: cli
2016-11-02 21:41:29 +01:00
5d177d55f0 Merge pull request #27948 from WeiZhang555/consistent-filters
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: 732006e113
Component: cli
2016-11-02 00:53:15 -07:00