toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
871 Commits 3 Branches 295 Tags
876db3d882c2a0f5bcedbd37d2eaf7caa77fa6f0
Commit Graph
871 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
Aaron Lehmann c0ed996a0b 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>
Upstream-commit: fd5673eeb9
Component: cli
 2016-11-10 12:05:19 -08:00
Yong Tang 1026429c8f 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>
Upstream-commit: 6f3ee9c568
Component: cli
 2016-11-10 10:20:24 -08:00
Sebastiaan van Stijn dab64a7154 Merge pull request #28243 from andrewhsu/change-context 
use "golang.org/x/net/context" instead of "context"
Upstream-commit: 82c10dd9f9
Component: cli
 2016-11-10 19:13:56 +01:00
Tibor Vass 27580de9af Merge pull request #28148 from vieux/rename_plugin_manifest 
rename plugin manifest
Upstream-commit: fb0e903122
Component: cli
 2016-11-10 09:47:15 -08: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
Andrew Hsu 3f3a95ef3e use "golang.org/x/net/context" instead of "context" 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: dc32cb6c77
Component: cli
 2016-11-10 08:23:19 -08: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 3aca7843a9 rename plugin manifest 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0ae9598f96
Component: cli
 2016-11-10 00:09:23 -08: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
yuexiao-wang 31f3e07b0b Remove redundant parameter and fix typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b6fe99530c
Component: cli
 2016-11-10 11:05:31 +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
Kenfe-Mickael Laventure f1194715ab Add expected 3rd party binaries commit ids to info 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 801167fcec
Component: cli
 2016-11-09 07:42:44 -08: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