docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
362 Commits 12 Branches 296 Tags
2dbf6f72b035db4a3505b142db531e341f446bdd
Commit Graph

362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
2dbf6f72b0 Implement ipamconfig.subnet and be more explicit about restart policy always. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cb1783590c
Component: cli
 2016-11-10 16:22:31 -05:00
Daniel Nephin
c9fe088e13 Handle bind options and volume options 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0333117b88
Component: cli
 2016-11-10 12:37:17 -05:00
Daniel Nephin
fe7cf88721 Restore stack deploy integration test with dab 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 458ffcd2e6
Component: cli
 2016-11-10 11:28:19 -05:00
Aanand Prasad
4821df0ab0 Reinstate --bundle-file argument to 'docker deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 791b687848
Component: cli
 2016-11-10 11:28:18 -05:00
Daniel Nephin
ae6497c7b8 Add integration test for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d05510d954
Component: cli
 2016-11-10 11:28:18 -05:00
Daniel Nephin
681106a47f Remove bundlefile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3875355a3e
Component: cli
 2016-11-10 11:28:18 -05:00
Daniel Nephin
bab5319d52 Remove duplication of name mangling. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef845be6a5
Component: cli
 2016-11-10 11:28:18 -05:00
Daniel Nephin
8692a2c8eb Always use a default network if no other networks are set. 
also add network labels.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d89cb4c62f
Component: cli
 2016-11-10 11:28:18 -05:00
Daniel Nephin
3474fbaade Send warnings to stderr. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ae8f001829
Component: cli
 2016-11-10 11:28:18 -05:00
Aanand Prasad
002c2a5040 Default to replicated mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 25c93d4ebb
Component: cli
 2016-11-10 11:28:18 -05:00
Aanand Prasad
7a88ddd32e Handle unsupported, deprecated and forbidden properties 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: dfab8f2bd4
Component: cli
 2016-11-10 11:28:18 -05:00
Daniel Nephin
aed389c1e8 Add swarmkit fields to stack service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e1b96b6447
Component: cli
 2016-11-10 11:28:18 -05:00
Aanand Prasad
3054994651 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>
Upstream-commit: a9fc9b60fe
Component: cli
 2016-11-10 11:28:18 -05:00
Daniel Nephin
ab7cf40180 Convert deploy to use a compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f702b722d8
Component: cli
 2016-11-10 11:28:18 -05:00
Sebastiaan van Stijn
dd6a352b1e Merge pull request #28186 from yongtang/27567-follow-up-dns-options 
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: c5fbdc8572
Component: cli
 2016-11-10 16:20:17 +01:00
Victor Vieux
317a3879fc Merge pull request #28224 from vieux/fix_manpages 
fix manpages
Upstream-commit: e876381912
Component: cli
 2016-11-09 23:22:30 -08:00
Victor Vieux
781f497519 Merge pull request #28164 from anusha-ragunathan/plugin-build 
Add plugin create functionality.
Upstream-commit: 1a34843c0c
Component: cli
 2016-11-09 17:49:51 -08:00
Victor Vieux
90efedd5e2 fix manpages 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 96c16101dd
Component: cli
 2016-11-09 17:11:14 -08:00
Aaron Lehmann
f93e810a9b Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 65e1e166ee
Component: cli
 2016-11-09 16:09:01 -08:00
Aaron Lehmann
c3469cb075 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: 56b7ad90b1
Component: cli
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
fc02a64b8c Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d006a04357
Component: cli
 2016-11-09 16:09:00 -08:00
Anusha Ragunathan
878834ace0 Add plugin create functionality. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: b825c58ff8
Component: cli
 2016-11-09 15:23:03 -08:00
Yong Tang
724a0461bc 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>
Upstream-commit: b38ca0f4c3
Component: cli
 2016-11-09 12:13:25 -08:00
Evan Hazlett
b1a6be626a use human readable units when listing secrets 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 06666a5a23
Component: cli
 2016-11-09 14:27:46 -05:00
Evan Hazlett
832247227c 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>
Upstream-commit: c7d7b50003
Component: cli
 2016-11-09 14:27:45 -05:00
Evan Hazlett
00bf1d223d SecretRequestOptions -> SecretRequestOption 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 0dc9115006
Component: cli
 2016-11-09 14:27:45 -05:00
Evan Hazlett
46910777dc support labels for secrets upon creation; review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 0bda23ec2b
Component: cli
 2016-11-09 14:27:45 -05:00
Evan Hazlett
8fd729c7c9 secrets: support simple syntax --secret foo 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: b3bbcc1ba6
Component: cli
 2016-11-09 14:27:45 -05:00
Evan Hazlett
b5d5eec781 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: 9074333957
Component: cli
 2016-11-09 14:27:45 -05:00
Evan Hazlett
7fac7dc9cb move secretopt to opts pkg 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 91c08eab93
Component: cli
 2016-11-09 14:27:45 -05:00
Evan Hazlett
4cba6b316c secrets: enable secret inspect and rm by secret name 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: d22e1a91f6
Component: cli
 2016-11-09 14:27:45 -05:00
Evan Hazlett
dfef330ccc secrets: use explicit format when using secrets 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 15b97a39d7
Component: cli
 2016-11-09 14:27:44 -05:00
Evan Hazlett
852ef98676 update to support new target in swarmkit 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 2b0fa52c09
Component: cli
 2016-11-09 14:27:44 -05:00
Evan Hazlett
2983ce883c simplify secret lookup on service create 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 6bbc35a743
Component: cli
 2016-11-09 14:27:44 -05:00
Evan Hazlett
9c66350efe support the same secret with different targets on service create 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: ab5f829742
Component: cli
 2016-11-09 14:27:44 -05:00
Evan Hazlett
41cabcef6d add secret support for service update 
- add nosuid and noexec to tmpfs

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 8554b64b99
Component: cli
 2016-11-09 14:27:44 -05:00
Evan Hazlett
89698b2350 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: 4e8f1a7dd9
Component: cli
 2016-11-09 14:27:43 -05:00
Evan Hazlett
7158215706 review changes 
- fix lint issues
- use errors pkg for wrapping errors
- cleanup on error when setting up secrets mount
- fix erroneous import
- remove unneeded switch for secret reference mode
- return single mount for secrets instead of slice

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 3f9494f1d6
Component: cli
 2016-11-09 14:27:43 -05:00
Evan Hazlett
a0307eb205 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: 1be644fbcf
Component: cli
 2016-11-09 14:27:43 -05:00
Vincent Demeester
a3f4ca2ca6 Merge pull request #28196 from allencloud/add-short-flag-for-force 
add short flag for force
Upstream-commit: a11f7b1577
Component: cli
 2016-11-09 18:11:58 +01:00
Sebastiaan van Stijn
7ca2ab3891 Merge pull request #28163 from yongtang/11082016-help-ptr 
Remove `-ptr` from the help output of `service create`
Upstream-commit: 45f8ef1668
Component: cli
 2016-11-09 17:53:06 +01:00
Vincent Demeester
d1e699cd15 Merge pull request #27947 from milindchawre/fix_27798 
Fixes #27798 : Update help for --blkio-weight parameter
Upstream-commit: 2332454882
Component: cli
 2016-11-09 15:35:38 +01:00
Vincent Demeester
02d5b85d62 Merge pull request #28201 from yuexiao-wang/test-func 
Update function name for TestCalculBlockIO
Upstream-commit: fbbc2d3a6d
Component: cli
 2016-11-09 15:34:25 +01:00
Yong Tang
180746c100 Remove -ptr from the help output of service create 
This fix is based on the comment:
https://github.com/docker/docker/pull/28147#discussion_r86996347

Previously the output string of the `DurationOpt` is `duration-ptr`
and `Uint64Opt` is `uint64-ptr`. While it is clear to developers,
for a normal user `-ptr` might not be very informative.

On the other hand, the default value of `DurationOpt` and `Uint64Opt`
has already been quite informative: `none`. That means if no flag
provided, the value will be treated as none.
(like a ptr with nil as the default)

For that reason this fix removes the `-ptr`.

Also, the output in the docs of `service create` has been quite
out-of-sync with the true output. So this fix updates the docs
to have the most up-to-date help output of `service create --help`.

This fix is related to #28147.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 071c746e5e
Component: cli
 2016-11-09 06:30:10 -08:00
milindchawre
19b738db2f Fixes #24083 : Improving cli help for flags with duration option 
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: e87262cc2d
Component: cli
 2016-11-09 12:17:28 +00:00
yuexiao-wang
cc55a23f4c Update function name for TestCalculBlockIO 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 18caa28b66
Component: cli
 2016-11-09 17:43:10 +08:00
Vincent Demeester
f3e7972551 Merge pull request #27997 from aaronlehmann/raft-options 
cli: Add options for Raft snapshotting
Upstream-commit: 01de03c7d0
Component: cli
 2016-11-09 10:19:45 +01:00
allencloud
24e894456a add short flag for force 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 31c5b957e2
Component: cli
 2016-11-09 14:40:47 +08:00
Victor Vieux
e7af1d5c1a Merge pull request #27745 from vieux/cli_backward_compose_api 
allow client to talk to an older server
Upstream-commit: 7fe223b68b
Component: cli
 2016-11-08 18:27:23 -08:00
Victor Vieux
c0453187a0 Merge pull request #28088 from aluzzardi/service-ps-task-resolution 
service ps: Truncate Task IDs
Upstream-commit: 3f839084b0
Component: cli
 2016-11-08 17:44:15 -08:00