Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
692 Commits 11 Branches 242 Tags 241 MiB
Commit Graph

48 Commits

Author SHA1 Message Date
allencloud 16b1631594 split compose deploy from deploy.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-02-17 17:13:31 +08:00
allencloud ca1e5ffeea remove cli/command/secrets/utils.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-01-29 13:32:49 +08:00
Daniel Nephin 4a1c23bc26 Add integration test for stack deploy with secrets. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-26 11:33:15 -05:00
Daniel Nephin 0382f4f365 Implement secret types for compose file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-26 11:33:15 -05:00
Vincent Demeester 70643ad005 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>
 2017-01-10 10:29:09 +01:00
Daniel Nephin 52c0157036 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>
 2016-12-27 16:17:24 -05:00
Daniel Nephin c4ea22972f Move pkg to cli/compose/convert 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 12:27:31 -05:00
Daniel Nephin 31355030b3 Move ConvertService to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 12:20:07 -05:00
Daniel Nephin af6a411358 Move ConvertVolumes to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 11:51:13 -05:00
Daniel Nephin a28db56b0f Move ConvertNetworks to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-16 11:51:13 -05:00
Vincent Demeester 7fbc616b47 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>
 2016-12-11 23:14:54 +01:00
Vincent Demeester 68db0a20dd 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>
 2016-12-05 15:18:36 +01:00
Victor Vieux d3411b7a70 Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks 
stack deploy: handle external network when deploying
 2016-11-29 15:00:35 -08:00
Daniel Nephin 798c4a614e Use namespace label on stack volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-28 18:02:39 -05:00
Vincent Demeester 8e63000bf3 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>
 2016-11-28 17:38:41 +01:00
Daniel Nephin 5ead1cc490 Better error message on stack deploy against not a swarm. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-23 12:15:11 -05:00
Victor Vieux 23c399dd10 Merge pull request #28677 from dnephin/remove-deploy-experimental 
Move `docker stack` out of experimental
 2016-11-21 14:33:35 -08:00
Daniel Nephin e1b5bdd768 Move docker stack out of experimental 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-21 15:30:25 -05:00
Vincent Demeester 2638cd6f3d 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>
 2016-11-21 17:59:29 +01:00
Vincent Demeester 4e343ae989 Merge pull request #28294 from vdemeester/compose-swarm-healthcheck 
Add support for healthcheck in compose to swarm
 2016-11-21 10:28:37 +01:00
Sebastiaan van Stijn 82804cc8e5 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>
 2016-11-18 22:04:27 +01:00
Aaron Lehmann b866fa77f4 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>
 2016-11-18 09:31:31 -08:00
Daniel Nephin c682f10a8f Default parallelism to 1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-18 16:17:08 +01:00
Vincent Demeester e21f4f9996 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>
 2016-11-18 15:09:13 +01:00
Sebastiaan van Stijn 57da27f76c Merge pull request #28297 from vdemeester/compose-swarm-openstdin 
Add support for stdin_open in compose to swarm
 2016-11-11 17:09:04 +01:00
Vincent Demeester 84a795bf05 Add support for extra_hosts in composefile v3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-11 15:20:02 +01:00
Vincent Demeester f24ff647e1 Add support for stdin_open in composefile v3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-11 15:19:00 +01:00
Vincent Demeester 356421b7da Add support for tty in composefile v3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-11 11:27:21 +01:00
Daniel Nephin cb1783590c Implement ipamconfig.subnet and be more explicit about restart policy always. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 16:22:31 -05:00
Daniel Nephin 0333117b88 Handle bind options and volume options 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 12:37:17 -05:00
Daniel Nephin 458ffcd2e6 Restore stack deploy integration test with dab 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:19 -05:00
Aanand Prasad 791b687848 Reinstate --bundle-file argument to 'docker deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin d05510d954 Add integration test for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin ef845be6a5 Remove duplication of name mangling. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin d89cb4c62f Always use a default network if no other networks are set. 
also add network labels.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin ae8f001829 Send warnings to stderr. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad 25c93d4ebb Default to replicated mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad dfab8f2bd4 Handle unsupported, deprecated and forbidden properties 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin e1b96b6447 Add swarmkit fields to stack service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad a9fc9b60fe 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>
 2016-11-10 11:28:18 -05:00
Daniel Nephin f702b722d8 Convert deploy to use a compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Victor Vieux 4ae7176ffb 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>
 2016-11-08 04:55:27 -08:00
Victor Vieux 1e10649f55 update cobra and use Tags 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-04 12:04:14 -07:00
Kenfe-Mickael Laventure 66bd963b76 Make experimental a runtime flag 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-24 15:20:01 -07:00
Yong Tang 0cb01799e9 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>
 2016-10-14 11:44:15 -07:00
Daniel Nephin a26ba0e702 Remove remaining registry methods from DockerCLI. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 15:50:01 -04:00
Daniel Nephin 8f3e3fb6e5 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>
 2016-09-08 15:46:48 -04:00
Daniel Nephin 3bd1eb4b76 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>
 2016-09-08 15:46:29 -04:00