Commit Graph

98 Commits

Author SHA1 Message Date
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
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
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
c7196b3968 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: d121e14ccd
Component: cli
2016-11-01 23:09:30 +08:00
7d5d39c4f3 Refactor client/request
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5f066ed250
Component: cli
2016-10-31 17:36:49 -04:00
fe94d78afa Generate ContainerWait response from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 85a0bd062d
Component: cli
2016-10-31 11:19:53 -04:00
e10d258b88 generate AuthResponse type from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ca7404a80a
Component: cli
2016-10-31 11:16:03 -04:00
4a62b2cc8e Generate container update response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 598e3a4874
Component: cli
2016-10-31 11:16:02 -04:00
bc55ba3a44 Use IDResponse for container create response.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f8cdc5ae71
Component: cli
2016-10-31 11:16:02 -04:00
71efaf6beb 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: d4d914bd52
Component: cli
2016-10-31 11:16:02 -04:00
9557c883f5 Generate container create response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e0f7f8d0dd
Component: cli
2016-10-31 11:16:02 -04:00
d817915a4e 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: 6dc945ab36
Component: cli
2016-10-31 11:13:41 -04:00
6fb78dfac2 Generate VolumesCreateRequest from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0325c474b8
Component: cli
2016-10-31 11:13:41 -04:00
daa7c9a587 Generate VolumeList response from the swagger spec
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3e13296c4e
Component: cli
2016-10-31 11:13:41 -04:00
831fa2006f Merge pull request #27394 from Microsoft/jjh/runelevated
Windows: Hint to run client elevated
Upstream-commit: e9089b55ee
Component: cli
2016-10-28 11:25:04 -07:00
40e9e05c74 Allow providing a custom storage directory for docker checkpoints
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: a38761aba4
Component: cli
2016-10-28 07:56:05 -04:00
dbd3d8d8d3 Merge pull request #26718 from ncdc/add-logs-to-container-attach-options
Add Logs to ContainerAttachOptions
Upstream-commit: 4c7160ed7b
Component: cli
2016-10-27 13:32:50 -07:00
d6afd26ba8 Merge pull request #26402 from qudongfang/ensure_client_transport_be_closed
ensure transport.Client be closed
Upstream-commit: 49fa58a2e9
Component: cli
2016-10-26 11:51:51 -07:00
e2164724b1 Merge pull request #27702 from tonistiigi/net-builder0
add --network option for docker build
Upstream-commit: 70fbc5e0bb
Component: cli
2016-10-25 21:50:33 -07:00
1ba89e2590 add --network option for docker build
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 01832cc0ab
Component: cli
2016-10-25 10:25:36 -07:00
2cd2223423 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: 171e533ba2
Component: cli
2016-10-25 06:43:54 +00:00
c2195d43eb Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 31f5d9b543
Component: cli
2016-10-24 15:20:01 -07:00
ca3b5155d5 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: a6a247fdf9
Component: cli
2016-10-20 13:24:23 -07:00
731dd426a8 Add Logs to ContainerAttachOptions
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: 27bab36800
Component: cli
2016-10-19 11:39:00 -04:00