p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,071 Commits 2 Branches 295 Tags
2e39dde1e552158f22dabaa349594db8d7149bb8
Commit Graph

33 Commits

Author SHA1 Message Date
Victor Vieux
2e39dde1e5 refactor help func in CLI 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: bf95472105e5dad55314cfff599abea5b81b134a
Component: engine
 2016-11-17 10:54:10 -08:00
Sebastiaan van Stijn
bb992b4f94 Merge pull request #28297 from vdemeester/compose-swarm-openstdin 
Add support for stdin_open in compose to swarm
Upstream-commit: e8469c0e63160174d00f60cdc2cc909593ab04b2
Component: engine
 2016-11-11 17:09:04 +01:00
Vincent Demeester
50bcf47873 Add support for extra_hosts in composefile v3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f32869d956eb175f88fd0b16992d2377d8eae79c
Component: engine
 2016-11-11 15:20:02 +01:00
Vincent Demeester
e846f5ae11 Add support for stdin_open in composefile v3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 84450b72cd73161449bae16b8ad0010fcc4a07eb
Component: engine
 2016-11-11 15:19:00 +01:00
Vincent Demeester
66e58fd23d Add support for tty in composefile v3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: de15de6b4d90f8d707d92ab2f8b6a63e0742e8ce
Component: engine
 2016-11-11 11:27:21 +01:00
Victor Vieux
ca36766d89 Merge pull request #27998 from dnephin/compose-on-swarm 
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
 2016-11-10 17:59:57 -08:00
Daniel Nephin
d5ff009b23 Implement ipamconfig.subnet and be more explicit about restart policy always. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dfd1227906a74acd51daed906802424299bda3bc
Component: engine
 2016-11-10 16:22:31 -05:00
Daniel Nephin
4c746a53ae Handle bind options and volume options 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef90081d44f204727254c4ae5f0b4910a77530fd
Component: engine
 2016-11-10 12:37:17 -05:00
Daniel Nephin
80cefc6683 Restore stack deploy integration test with dab 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bd8de8d8be9e367af9e045d0fdead4462fed490c
Component: engine
 2016-11-10 11:28:19 -05:00
Aanand Prasad
f16c51a10e Reinstate --bundle-file argument to 'docker deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: aa5e7d038a5459df55f5c039d4a881a4558aa247
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
3a6b62c164 Add integration test for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: eefccc25c5cda96947978c503d5764aa48aacd7d
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
2d56062821 Remove bundlefile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b45581b78610e9fe41b8fde19188868aac6df250
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
184722486c Remove duplication of name mangling. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 46ca5827f99e627d7b63433497aee145c1d0468e
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
36eb40263d 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: 644d30369a348db4d904d86958c2b57a0de36990
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
1908145b38 Send warnings to stderr. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b0efbcc34a77d5d8869cc381064d3741b67f9776
Component: engine
 2016-11-10 11:28:18 -05:00
Aanand Prasad
787c19b18c Default to replicated mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 3d2cb23782da72f650da438b11d4db87ccdbb596
Component: engine
 2016-11-10 11:28:18 -05:00
Aanand Prasad
15d5c8d4af Handle unsupported, deprecated and forbidden properties 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: fcad58f3c85145f0414ffba72321bbb10d16e272
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
941e9ca594 Add swarmkit fields to stack service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 13384ba34b8d57d9cc6e68ff9c8b0b72bc72f9c3
Component: engine
 2016-11-10 11:28:18 -05:00
Aanand Prasad
860efa419b 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: 0884e3c86892a0f51b8feeeb30ff486c821796f5
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin
52cbc60fd5 Convert deploy to use a compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cbbc6b4d9bd50f7409c6d935efc899946c449de3
Component: engine
 2016-11-10 11:28:18 -05:00
yuexiao-wang
f3074c32a8 Remove redundant parameter and fix typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 713cae7ca2b8a5fa36e25f3fb30531f6400fafc3
Component: engine
 2016-11-10 11:05:31 +08: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
ffbf855e39 update cobra and use Tags 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: d34ca0178e42cddc760316bbcb6a3aa8bea8b3ed
Component: engine
 2016-11-04 12:04:14 -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
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
Yong Tang
6f9659dfb5 Allow docker deploy command accept filename with/without extension 
This fix tries to address the issue raised in 25855 where the command
`docker deploy` can only accept a STACK without extension of `.dab`.
In other words, `docker deploy hellojavaee.dab` gives an error:
```
Bundle hellojavaee.dab.dab not found. Specify the path with --file
```

This fix updates the way namespace STACK is taken so that in case
`STACK.dab` is provided with `docker deploy`:
```
$ docker deploy STACK.dab
```
The `STACK` is used as namespace (instead of `STACK.dab`).

NOTE: This fix will only allows `.dab` extension in namespace, because
it is not possible to have a namespace with `.` in the middle. In other
words, a namespace `hello.java.ee` will not work anyway (whether the file
`hello.java.ee` exists or not).

An additional integration test has been added to cover the changes.

This fix fixes 25855.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1e9d04c458e90f38c970c7937830504d2e919066
Component: engine
 2016-10-14 11:44:15 -07:00
Akihiro Suda
0d2c33693e add docker stack ls 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5ce08ddfcae5ded73ef0c93c9daba7c916c21ae5
Component: engine
 2016-09-22 19:31:39 +00:00
Daniel Nephin
cca442f52e Make all the experimental subcommand consistent. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6eefcea51a85d202fcb1e282c6c74b4553743107
Component: engine
 2016-09-19 16:27:23 -04:00
Daniel Nephin
89cbe8e685 Only hide commands if the env variable is set. 
Better formatting for usage template.
Group commands in usage to management/operation commands.
Remove the word Docker from the description of management commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a7c8bcac2ba60d6dd25a1157085d9245bed556ce
Component: engine
 2016-09-19 13:28:15 -04:00
Daniel Nephin
555894f6f3 Move canonical image and container commands into a command group 
Hide some top level commands
Add docker container and image inspect commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b993609d5ad4590da72e217bb43786b74aabc183
Component: engine
 2016-09-19 13:28:02 -04:00
Daniel Nephin
be2034fe8c Remove remaining registry methods from DockerCLI. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1dd46e06444d1a0c73fc88dfccec4ae0b7f10bf6
Component: engine
 2016-09-09 15:50:01 -04:00
Daniel Nephin
0238cc6815 Replace api/client imports with cli/command in experimental files. 
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9c2b9358125175db366ca000e6dae9af8dc88e2d
Component: engine
 2016-09-08 15:46:48 -04:00
Daniel Nephin
d8acc366ce Move api/client -> cli/command 
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd
Component: engine
 2016-09-08 15:46:29 -04:00