Commit Graph

33 Commits

Author SHA1 Message Date
98e2097ade Add support for healthcheck in composefile v3
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e21f4f9996
Component: cli
2016-11-18 15:09:13 +01:00
d39fb19105 Merge pull request #28297 from vdemeester/compose-swarm-openstdin
Add support for stdin_open in compose to swarm
Upstream-commit: 57da27f76c
Component: cli
2016-11-11 17:09:04 +01:00
a03dcc83b4 Add support for extra_hosts in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 84a795bf05
Component: cli
2016-11-11 15:20:02 +01:00
03ba4d6a33 Add support for stdin_open in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f24ff647e1
Component: cli
2016-11-11 15:19:00 +01:00
ea25b45846 Add support for tty in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 356421b7da
Component: cli
2016-11-11 11:27:21 +01:00
89896ee078 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
Upstream-commit: 7d89ba2d9d
Component: cli
2016-11-10 17:59:57 -08:00
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
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
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
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
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
681106a47f Remove bundlefile
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3875355a3e
Component: cli
2016-11-10 11:28:18 -05:00
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
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
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
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
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
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
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
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
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
307edac963 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: 4ae7176ffb
Component: cli
2016-11-08 04:55:27 -08:00
75f0b0b043 update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 1e10649f55
Component: cli
2016-11-04 12:04:14 -07:00
ca8b6d0b28 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: 9eceaa926f
Component: cli
2016-11-01 23:09:30 +08:00
2451915c27 Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 66bd963b76
Component: cli
2016-10-24 15:20:01 -07:00
da9c666ce4 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: 0cb01799e9
Component: cli
2016-10-14 11:44:15 -07:00
7883253071 add docker stack ls
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b06f3f27a4
Component: cli
2016-09-22 19:31:39 +00:00
54e30a1ee6 Make all the experimental subcommand consistent.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3e1b9350f5
Component: cli
2016-09-19 16:27:23 -04:00
a765266b0a 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: 1f0f7ecb5a
Component: cli
2016-09-19 13:28:15 -04:00
5ae46f25cb 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: accc5d5bd4
Component: cli
2016-09-19 13:28:02 -04:00
3c8785422e Remove remaining registry methods from DockerCLI.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a26ba0e702
Component: cli
2016-09-09 15:50:01 -04:00
bc178aeaa8 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: 8f3e3fb6e5
Component: cli
2016-09-08 15:46:48 -04:00
964a552e76 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: 3bd1eb4b76
Component: cli
2016-09-08 15:46:29 -04:00