docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
29,489 Commits 12 Branches 297 Tags
f1b91b00bc42626fe54cc33dac2c10e48de165bb
Commit Graph

113 Commits

Author SHA1 Message Date
yuexiao-wang
76b998fd2d Fix the inconsistent function name for client 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 16233eb055ef03c760f76c276b4491ee3246c0b4
Component: engine
 2016-12-02 04:18:02 +08:00
Akihiro Suda
c0414c54e6 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: a754d89b4058d8508cf3cee29f6107b2f93f3001
Component: engine
 2016-11-29 09:02:52 +00: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
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
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
Vincent Demeester
33dbfcc591 Merge pull request #28659 from xuzhenglun/master 
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: d1258c761a9d2fac6c7830c77c7d8f91426bada3
Component: engine
 2016-11-22 13:01:05 +01:00
Reficul
3bfc791696 fix incorrect ErrConnectFailed comparison 
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: d5dc9b8b1f5e693cfb3aace06e08e7fc6eb798d7
Component: engine
 2016-11-22 10:42:55 +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
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
Zhang Wei
92c12f5ddb 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: 4d54d30477f2eb0f373fd2301cf4c3ecc1434d62
Component: engine
 2016-11-21 17:31:46 +08: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
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
Vincent Demeester
fac3c72b9c Merge pull request #28540 from lixiaobing10051267/masterNewContainerId 
expected new_container_id while testing ContainerCommit
Upstream-commit: c0acfd1dadff10b3151699558232af7b7fc67718
Component: engine
 2016-11-18 12:13:30 +01:00
lixiaobing10051267
bab39b5981 expected new_container_id while testing ContainerCommit 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 773ae28daed55c8d89e753c1cb6b8b7e4102d3b6
Component: engine
 2016-11-18 10:21:04 +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
Sebastiaan van Stijn
9b39de5905 Merge pull request #28512 from anusha-ragunathan/fix_enable 
Cleanup after plugin install.
Upstream-commit: a58e3e7fefd67ebe57c183e970e5fcda096c9ad1
Component: engine
 2016-11-17 10:16:47 +01:00
Sebastiaan van Stijn
9fe7b62295 Merge pull request #28322 from Microsoft/jjh/api1.26 
Bump API to v1.26
Upstream-commit: 3f9dc0213583c7e903bebb02733df1e9ec9263b6
Component: engine
 2016-11-17 00:01:46 +01:00
Anusha Ragunathan
6f5b54ba77 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: 1144f8f1d4b1fd2bbf1f41bf5dad8d929d0dc06e
Component: engine
 2016-11-16 14:45:51 -08:00
John Howard
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
wefine
7a9630020f fix t.Errorf to t.Error in serveral _test.go 
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
Upstream-commit: f78f7de96aebee64b55bb9955fa6c97be2c59662
Component: engine
 2016-11-14 17:54:43 +08:00
Vincent Demeester
e75f2fc3c8 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: 820b809e70df8b9c7af00256182c48d935972a5c
Component: engine
 2016-11-11 15:34:01 +01:00
Victor Vieux
36fa7495ed Merge pull request #28217 from Microsoft/jjh/373engineapifollowup 
Tidy GetDockerOS() function
Upstream-commit: 4453fd22a7ff3f51383c814a4cbd119bccbe7a92
Component: engine
 2016-11-10 18:57:56 -08:00
Victor Vieux
fadae43674 move plugins out of experimental 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
 2016-11-10 15:51:32 -08:00
Andrea Luzzardi
4d22d82151 api: Service Logs support 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 819d0159bbda1b3ae53bdaa9a3e62ac98497e24c
Component: engine
 2016-11-10 13:46:02 -08:00
Victor Vieux
62ec0be101 Merge pull request #28164 from anusha-ragunathan/plugin-build 
Add plugin create functionality.
Upstream-commit: 28a1ea342d1f227664ad30ffd05eaaab8c9ef93e
Component: engine
 2016-11-09 17:49:51 -08:00
Aaron Lehmann
2394a196a1 Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a6030a50c95cd4e8b39b5f4d5705bb23ebdb28c5
Component: engine
 2016-11-09 16:09:01 -08:00
Aaron Lehmann
0827ead1b6 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: 0f9fc54df9274327ed22f4e07f0981a648e0278a
Component: engine
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
2874df7efa Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b4a667c8c4f536445d35e8914a58e8c749f16ea6
Component: engine
 2016-11-09 16:09:00 -08:00
Anusha Ragunathan
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
John Howard
b16c7d965b Tidy GetDockerOS() function 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d8dcbf3ec347ceb3da0d960ffe51f1ab1bb32a83
Component: engine
 2016-11-09 14:46:53 -08:00
Evan Hazlett
e093728442 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: b2e4c7f3b5b30fc6940768ec41836d708a48b463
Component: engine
 2016-11-09 14:27:45 -05:00
Evan Hazlett
848c015ac1 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: 189f89301e0abfee32447f2ca23dacd3a96de06d
Component: engine
 2016-11-09 14:27:43 -05:00
Evan Hazlett
9dbbc071d5 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: 3716ec25b423d8ff7dfa231a7b3cf0154726ed37
Component: engine
 2016-11-09 14:27:43 -05:00
Victor Vieux
d0ebaa81e8 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: e98e4a71110fd33852bb755a9b8b4ebc9df904db
Component: engine
 2016-11-08 04:55:27 -08:00
Victor Vieux
a24a48331c support settings in docker plugins install 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 69276fddf8269e6de7bf297d4a7127e0ed977cb7
Component: engine
 2016-11-07 22:49:22 -08:00
Antonio Murdaca
4233bef46b client: bump default version to v1.25 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 42a1f7cdf98fc97403ad53695d8ccf884e27e59f
Component: engine
 2016-11-07 10:01:28 +01:00
Vincent Demeester
26a4e23cf3 Merge pull request #28065 from lixiaobing10051267/masterServerEror 
add error information to distinguish different test scene
Upstream-commit: 325eaa7ba475233586d74831c446bb341f48fe8a
Component: engine
 2016-11-07 09:16:16 +01:00
lixiaobing10051267
062deefffb add error information to distinguish different test scene 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 925c1427a8ed308ce55a0eed709c56515aeabcc4
Component: engine
 2016-11-04 17:16:11 +08:00
Antonio Murdaca
250cd5b7d2 daemon: add a flag to override the default seccomp profile 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: b237189e6c8a4f97be59f08c63cdcb1f2f4680a8
Component: engine
 2016-11-02 21:41:29 +01:00
Sebastiaan van Stijn
50046511ff Merge pull request #27948 from WeiZhang555/consistent-filters 
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: f96d45dc8ac21db1f082230e2f828a86e15cad46
Component: engine
 2016-11-02 00:53:15 -07:00
Zhang Wei
9cb45952e0 Replace all "Filter" field with "Filters" for consistency 
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 89a6966726941b4b7f0431ab214013cf9c655c25
Component: engine
 2016-11-01 23:09:30 +08:00
Daniel Nephin
a2eb4ad244 Refactor client/request 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d32ffb72b7a9979448345947b27347f3adfa8460
Component: engine
 2016-10-31 17:36:49 -04:00
Daniel Nephin
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
Daniel Nephin
bc7bcb9601 generate AuthResponse type from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2732b8a9bb3edb92121d0b0dcc144e5f557e2fbf
Component: engine
 2016-10-31 11:16:03 -04:00
Daniel Nephin
1b85879c03 Generate container update response from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f196cf6a090556ccb42198043a71d133482b510d
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
1759ab5e8b Use IDResponse for container create response. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c8d5e7203e1ae140a5cca312b6699063b521cf83
Component: engine
 2016-10-31 11:16:02 -04:00