toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,118 Commits 3 Branches 295 Tags
ba28f133a99db93b7c157f17de18357381139d2e
Commit Graph

96 Commits

Author SHA1 Message Date
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
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
Daniel Nephin
01541139a5 Add an IDResponse type 
Generated from a swagger spec and use it for container exec response

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01883c136d9ef06962d80aa81e27d1d90eb6d199
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
913e9a48c1 Generate container create response from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bad849fc826b410c3aeb753a8c7f6b38f7ae12b0
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
dc10e9a664 Use a config to generate swagger api types 
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 29df3bdb117a058ae040686dd0f2565ae9ad743a
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
d19255532a Generate VolumesCreateRequest from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
31c5c30bb3 Generate VolumeList response from the swagger spec 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
 2016-10-31 11:13:41 -04:00
Michael Crosby
9988859ce7 Merge pull request #27394 from Microsoft/jjh/runelevated 
Windows: Hint to run client elevated
Upstream-commit: 8a99bf6fa9d7efe4dea275a610824d01ed969b9b
Component: engine
 2016-10-28 11:25:04 -07:00
boucher
0e3402d520 Allow providing a custom storage directory for docker checkpoints 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: bd7d51292c399edba5f339e6be55fac6c0811ff5
Component: engine
 2016-10-28 07:56:05 -04:00
Kenfe-Mickaël Laventure
47fed3161f Merge pull request #26718 from ncdc/add-logs-to-container-attach-options 
Add Logs to ContainerAttachOptions
Upstream-commit: 4d2e258531a4c3f2e042c6dda79463b46f1b5880
Component: engine
 2016-10-27 13:32:50 -07:00
Tibor Vass
157dbff3e2 Merge pull request #26402 from qudongfang/ensure_client_transport_be_closed 
ensure transport.Client be closed
Upstream-commit: 335a3c614917595cb7602adeb7173a0d228f825b
Component: engine
 2016-10-26 11:51:51 -07:00
Sebastiaan van Stijn
b63aa05761 Merge pull request #27702 from tonistiigi/net-builder0 
add --network option for docker build
Upstream-commit: 62ff3e90835c3c572051afbbbac53303e57a5c89
Component: engine
 2016-10-25 21:50:33 -07:00
sandyskies
29210e7b5b add --network option for docker build 
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 60813af7aeea819ca228b6b1d6f4888969b95da3
Component: engine
 2016-10-25 10:25:36 -07:00
Akihiro Suda
4fb550ce0f add docker network prune 
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 7e24c16086a9a4f38e241e51837f2be4877c04a6
Component: engine
 2016-10-25 06:43:54 +00:00
Kenfe-Mickael Laventure
9a299b360f Make experimental a runtime flag 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
 2016-10-24 15:20:01 -07:00
Daniel Nephin
b8b81c7fa0 Generate api/types:Image from the swagger spec 
and rename it to a more appropriate name ImageSummary.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b06c3527831a585ac7e44d0b3ea060cc2092e6ef
Component: engine
 2016-10-20 13:24:23 -07:00
Andy Goldstein
3c2827770b Add Logs to ContainerAttachOptions 
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: fc8097f957ec7ae990f84faf54bce85a399c96af
Component: engine
 2016-10-19 11:39:00 -04:00
Aaron Lehmann
8fcdc8e325 API changes for service rollback and failure threshold 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 67bebd6d819ef46c78092441732fe2afde04fd5b
Component: engine
 2016-10-18 10:09:30 -07:00
John Howard
064957cb0f Windows: Hint to run client elevated 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dcd242d8a2e6532d18f17e8a9a6f98edd2ca8bc1
Component: engine
 2016-10-14 10:42:04 -07:00