Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
379 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

271 Commits

Author SHA1 Message Date
Victor Vieux 7d89ba2d9d Merge pull request #27998 from dnephin/compose-on-swarm 
Support `docker stack deploy` from a Compose file
 2016-11-10 17:59:57 -08:00
Lei Jitang 005a3037de Merge pull request #28231 from yuexiao-wang/container-exec 
Remove redundant parameter and fix typos
 2016-11-11 09:55:42 +08:00
Victor Vieux 63167f17b0 Merge pull request #28226 from vieux/exit_exp_plugin 
move plugins out of experimental
 2016-11-10 17:30:54 -08:00
Victor Vieux 32beb80f99 Merge pull request #28031 from yongtang/27902-extra-hosts 
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
 2016-11-10 16:55:29 -08:00
Victor Vieux f5cea67e33 move plugins out of experimental 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-10 15:51:32 -08:00
Andrea Luzzardi 79e1fd01ce Merge pull request #28089 from aluzzardi/service-logs 
service logs
 2016-11-10 15:13:41 -08:00
Victor Vieux d04c77bdae Merge pull request #28253 from aaronlehmann/arg-descriptions 
cli: Change autolock flag description
 2016-11-10 13:59:46 -08:00
Andrea Luzzardi b059cf5286 cli: docker service logs support 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-10 13:46:02 -08:00
Michael Crosby 6bf79deab5 Merge pull request #27797 from vdemeester/stats-format-names-support 
Add support for Names and ID in stats format
 2016-11-10 13:26:00 -08:00
Daniel Nephin cb1783590c Implement ipamconfig.subnet and be more explicit about restart policy always. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 16:22:31 -05:00
Aaron Lehmann fd5673eeb9 cli: Change autolock flag description 
This change incorporates feedback from @thaJeztah in the PR that added
the autolock flag. It changes the descriptions to be different for
"swarm init" and "swarm update" so that the boolean nature so that the
purpose of the flag in both contexts is clearer.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-10 12:05:19 -08:00
Yong Tang 6f3ee9c568 Add flag `--host` to `service create` and `--host-add/--host-rm` to `service update` 
This fix tries to address 27902 by adding a flag `--host`
to `docker service create` and `--host-add/--host-rm` to
`docker service update`, so that it is possible to
specify extra `host:ip` settings in `/etc/hosts`.

This fix adds `Hosts` in swarmkit's `ContainerSpec` so that it
is possible to specify extra hosts during service creation.

Related docs has been updated.

An integration test has been added.

This fix fixes 27902.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-10 10:20:24 -08:00
Sebastiaan van Stijn 82c10dd9f9 Merge pull request #28243 from andrewhsu/change-context 
use "golang.org/x/net/context" instead of "context"
 2016-11-10 19:13:56 +01:00
Tibor Vass fb0e903122 Merge pull request #28148 from vieux/rename_plugin_manifest 
rename plugin manifest
 2016-11-10 09:47:15 -08:00
Daniel Nephin 0333117b88 Handle bind options and volume options 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 12:37:17 -05:00
Daniel Nephin 458ffcd2e6 Restore stack deploy integration test with dab 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:19 -05:00
Aanand Prasad 791b687848 Reinstate --bundle-file argument to 'docker deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin d05510d954 Add integration test for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin 3875355a3e Remove bundlefile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin ef845be6a5 Remove duplication of name mangling. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin d89cb4c62f Always use a default network if no other networks are set. 
also add network labels.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin ae8f001829 Send warnings to stderr. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad 25c93d4ebb Default to replicated mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad dfab8f2bd4 Handle unsupported, deprecated and forbidden properties 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin e1b96b6447 Add swarmkit fields to stack service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad a9fc9b60fe Add support for service-level 'volumes' key 
Support volume driver + options
Support external volumes
Support hostname in Compose file

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin f702b722d8 Convert deploy to use a compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Andrew Hsu dc32cb6c77 use "golang.org/x/net/context" instead of "context" 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-11-10 08:23:19 -08:00
Sebastiaan van Stijn c5fbdc8572 Merge pull request #28186 from yongtang/27567-follow-up-dns-options 
Add `--dns-option` to `docker run` and hide `--dns-opt`
 2016-11-10 16:20:17 +01:00
Victor Vieux 0ae9598f96 rename plugin manifest 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-10 00:09:23 -08:00
Victor Vieux e876381912 Merge pull request #28224 from vieux/fix_manpages 
fix manpages
 2016-11-09 23:22:30 -08:00
yuexiao-wang b6fe99530c Remove redundant parameter and fix typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-10 11:05:31 +08:00
Victor Vieux 1a34843c0c Merge pull request #28164 from anusha-ragunathan/plugin-build 
Add plugin create functionality.
 2016-11-09 17:49:51 -08:00
Victor Vieux 96c16101dd fix manpages 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-09 17:11:14 -08:00
Aaron Lehmann 65e1e166ee Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:09:01 -08:00
Aaron Lehmann 56b7ad90b1 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>
 2016-11-09 16:09:00 -08:00
Tonis Tiigi d006a04357 Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-09 16:09:00 -08:00
Anusha Ragunathan b825c58ff8 Add plugin create functionality. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-09 15:23:03 -08:00
Yong Tang b38ca0f4c3 Add `--dns-option` to `docker run` and hide `--dns-opt` 
This fix is a follow up to #27567 based on:
https://github.com/docker/docker/pull/27567#issuecomment-259295055

In #27567, `--dns-options` has been added to `service create/update`,
together with `--dns` and `--dns-search`. The `--dns-opt` was used
in `docker run`.

This fix add `--dns-option` (not `--dns-options`) to `docker run/create`, and hide
`--dns-opt`. It is still possible to use `--dns-opt` with
`docker run/create`, though it will not show up in help output.

This fix change `--dns-options`to --dns-option` for `docker service create`
and `docker service update`.

This fix also updates the docs and bash/zsh completion scripts.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-09 12:13:25 -08:00
Evan Hazlett 06666a5a23 use human readable units when listing secrets 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:46 -05:00
Evan Hazlett c7d7b50003 more review updates 
- return err instead of wrap for update secret
- add omitempty for data in secret spec

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett 0dc9115006 SecretRequestOptions -> SecretRequestOption 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett 0bda23ec2b support labels for secrets upon creation; review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett b3bbcc1ba6 secrets: support simple syntax --secret foo 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett 9074333957 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>
 2016-11-09 14:27:45 -05:00
Evan Hazlett 91c08eab93 move secretopt to opts pkg 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett d22e1a91f6 secrets: enable secret inspect and rm by secret name 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett 15b97a39d7 secrets: use explicit format when using secrets 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett 2b0fa52c09 update to support new target in swarmkit 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett 6bbc35a743 simplify secret lookup on service create 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00