41c8dfca13
Merge pull request #30186 from thaJeztah/add-version-annotation-to-flags
...
Add version annotation to various flags added in 1.13
Upstream-commit: 2e02d615c4
2017-01-30 12:33:36 -08:00
c3e631a485
remove cli/command/secrets/utils.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ca1e5ffeea
2017-01-29 13:32:49 +08:00
65bef339c1
Remove secrets as part of stack remove.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 40bde3ee00
2017-01-26 11:33:15 -05:00
a568e7cd60
Add integration test for stack deploy with secrets.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4a1c23bc26
2017-01-26 11:33:15 -05:00
5805451da4
Implement secret types for compose file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0382f4f365
2017-01-26 11:33:15 -05:00
1daa5daff5
Add version annotation to various flags added in 1.13
...
Pull request https://github.com/docker/docker/pull/27745 added support for the
client to talk to older versions of the daemon. Various flags were added to
docker 1.13 that are not compatible with older daemons.
This PR adds annotations to those flags, so that they are automatically hidden
if the daemon is older than docker 1.13 (API 1.25).
Not all new flags affect the API (some are client-side only). The following
PR's added new flags to docker 1.13 that affect the API;
- https://github.com/docker/docker/pull/23430 added `--cpu-rt-period`and `--cpu-rt-runtime`
- https://github.com/docker/docker/pull/27800 / https://github.com/docker/docker/pull/25317 added `--group` / `--group-add` / `--group-rm`
- https://github.com/docker/docker/pull/27702 added `--network` to `docker build`
- https://github.com/docker/docker/pull/25962 added `--attachable` to `docker network create`
- https://github.com/docker/docker/pull/27998 added `--compose-file` to `docker stack deploy`
- https://github.com/docker/docker/pull/22566 added `--stop-timeout` to `docker run` and `docker create`
- https://github.com/docker/docker/pull/26061 added `--init` to `docker run` and `docker create`
- https://github.com/docker/docker/pull/26941 added `--init-path` to `docker run` and `docker create`
- https://github.com/docker/docker/pull/27958 added `--cpus` on `docker run` / `docker create`
- https://github.com/docker/docker/pull/27567 added `--dns`, `--dns-opt`, and `--dns-search` to `docker service create`
- https://github.com/docker/docker/pull/27596 added `--force` to `docker service update`
- https://github.com/docker/docker/pull/27857 added `--hostname` to `docker service create`
- https://github.com/docker/docker/pull/28031 added `--hosts`, `--host-add` / `--host-rm` to `docker service create` and `docker service update`
- https://github.com/docker/docker/pull/28076 added `--tty` on `docker service create` / `docker service update`
- https://github.com/docker/docker/pull/26421 added `--update-max-failure-ratio`, `--update-monitor` and `--rollback` on `docker service update`
- https://github.com/docker/docker/pull/27369 added `--health-cmd`, `--health-interval`, `--health-retries`, `--health-timeout` and `--no-healthcheck` options to `docker service create` and `docker service update`
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5d2722f83d
2017-01-16 18:21:20 +01:00
4b2d2c595b
Few stack deploy network fixes
...
- Make sure we use the correct network name for external ones.
- Make the default network overridable and only creates networks that
are used by services — so that default network is only created if a
service doesn't declare a network.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 70643ad005
2017-01-10 10:29:09 +01:00
6a9af71e6e
Replace vendor of aanand/compose-file with a local copy.
...
Add go-bindata for including the schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 52c0157036
2016-12-27 16:17:24 -05:00
61848b38b0
Remove docker stack ps -a to match removal of docker service/node ps -a
...
In #28507 and #28885 , `docker service/node ps -a` has been removed so that
information about slots are show up even without `-a` flag.
The output of `docker stack ps` reused the same output as `docker service/node ps`.
However, the `-a` was still there. It might make sense to remove `docker stack ps -a`
as well to bring consistency with `docker service/node ps`.
This fix is related to #28507 , #28885 , and #25983 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 65be5677bd
2016-12-26 13:47:43 -08:00
49a03faa44
Move pkg to cli/compose/convert
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c4ea22972f
2016-12-16 12:27:31 -05:00
415fa73d46
Move ConvertService to composetransform package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 31355030b3
2016-12-16 12:20:07 -05:00
4c4bfbf1f3
Move ConvertVolumes to composetransform package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: af6a411358
2016-12-16 11:51:13 -05:00
b77718801b
Move ConvertNetworks to composetransform package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a28db56b0f
2016-12-16 11:51:13 -05:00
eef5b8fb30
Remove --port and update --publish for services to support syntaxes
...
Add support for simple and complex syntax to `--publish` through the
use of `PortOpt`.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7fbc616b47
2016-12-11 23:14:54 +01:00
8986c729f3
Handle logging in compose to swarm
...
Logging configuration was completely ignore when deploy a compose file
to swarm. This fixes it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 68db0a20dd
2016-12-05 15:18:36 +01:00
030c2b38ea
Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks
...
stack deploy: handle external network when deploying
Upstream-commit: d3411b7a70
2016-11-29 15:00:35 -08:00
e387834219
Use namespace label on stack volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 798c4a614e
2016-11-28 18:02:39 -05:00
535a0c8419
stack deploy: handle external network when deploying
...
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8e63000bf3
2016-11-28 17:38:41 +01:00
2e594e381b
Add a short flag for docker stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7b35599e2d
2016-11-25 13:23:36 -05:00
6e1cc0ff7f
Better error message on stack deploy against not a swarm.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ead1cc490
2016-11-23 12:15:11 -05:00
f85b33128a
Merge pull request #28677 from dnephin/remove-deploy-experimental
...
Move `docker stack` out of experimental
Upstream-commit: 23c399dd10
2016-11-21 14:33:35 -08:00
bc199413c3
Move docker stack out of experimental
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e1b5bdd768
2016-11-21 15:30:25 -05:00
df30b2fb86
Do not panic if network is nil
...
network is `nil` if the following case:
```
services:
foo:
image: nginx
networks:
mynetwork:
```
It's a valid compose so we should not panic.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2638cd6f3d
2016-11-21 17:59:29 +01:00
7970861bba
Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
...
Add support for healthcheck in compose to swarm
Upstream-commit: 4e343ae989
2016-11-21 10:28:37 +01:00
607719cae6
swap position of "host" and "ip"
...
the service definition uses the format as defined
in http://man7.org/linux/man-pages/man5/hosts.5.html
(IP_address canonical_hostname [aliases...])
This format is the _reverse_ of the format used in
the container API.
Commit f32869d956eb175f88fd0b16992d2377d8eae79c
inadvertently used the incorrect order.
This fixes the order, and correctly sets it to;
IP-Address hostname
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 82804cc8e5
2016-11-18 22:04:27 +01:00
dee52b4790
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: b866fa77f4
2016-11-18 09:31:31 -08:00
21435bb7d5
Default parallelism to 1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c682f10a8f
2016-11-18 16:17:08 +01:00
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
2016-11-18 15:09:13 +01:00
82ea944d4a
Merge pull request #28554 from vieux/showhelp
...
refactor help func in CLI
Upstream-commit: 4e4b58fbcb
2016-11-17 14:27:26 -08:00
7487e32054
refactor help func in CLI
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 55908f8a82
2016-11-17 10:54:10 -08:00
7e9ea5342a
Fix several issues with go vet and go fmt
...
For some reason, `go vet` and `go fmt` validate does not capture
several issues.
The following was the output of `go vet`:
```
ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$'
cli/command/formatter/container_test.go:393: possible formatting directive in Log call
volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool
```
The following was the output of `go fmt -s`:
```
ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor
cli/command/stack/list.go
daemon/commit.go
```
Fixed above issues with `go vet` and `go fmt -s`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: d691bce8c9
2016-11-17 06:31:28 -08:00
d39fb19105
Merge pull request #28297 from vdemeester/compose-swarm-openstdin
...
Add support for stdin_open in compose to swarm
Upstream-commit: 57da27f76c
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
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
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
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
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
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
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
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
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
2016-11-10 11:28:18 -05:00
681106a47f
Remove bundlefile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3875355a3e
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
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
2016-11-10 11:28:18 -05:00
3474fbaade
Send warnings to stderr.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ae8f001829
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
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
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
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
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
2016-11-10 11:28:18 -05:00
