f804f893b6
cli: Deploying a compose file must use TaskTemplate.Networks
...
This is the non-deprecated field, and the one that can be changed in a
service update.
Since old daemon versions don't allow migrating from one field to the
other, make this conditional on the API version.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-07 16:46:25 -07:00
a58f798fdf
Added start period option to health check.
...
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
2017-04-06 12:35:34 +02:00
e9d6193dfd
Replace fmt.Errorf() with errors.Errorf() in the cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 16:58:07 -04:00
c70387aebc
Cleanup compose convert error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 10:43:28 -04:00
6e24fc3f58
Merge pull request #30781 from AkihiroSuda/fix-stack-env
...
compose: fix environment interpolation from the client
2017-03-17 15:56:50 +01:00
395081fc6b
api: Remove SecretRequestOption type
...
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-16 11:20:31 -07:00
146d3eb304
Fix environment resolving.
...
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-14 16:00:43 -04:00
d1fc5acc2e
Merge pull request #31795 from dnephin/compose-file-v3.2
...
Compose file v3.2
2017-03-14 14:10:24 -04:00
33bfb1e5e5
Move endpoint_mode under deploy and add it to the schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-13 15:00:56 -04:00
cd1cde6e77
support both endpoint modes in stack
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-03-13 15:00:49 -04:00
5de7378cbe
Support customizing the default network for a stack.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-24 17:32:23 -05:00
645f6ba7f5
Set 0444 as default secret mode in stack deploy
...
Change the default secret mode to match the default one used in
`service` subcommands.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-16 11:26:05 +01:00
c53471254b
Support expanded ports in Compose loader
...
This commit adds support for expanded ports in Compose loader,
and add several unit tests for loading expanded port format.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-07 09:14:56 -08:00
3df952523c
Make docker stack deploy a little bit more indempotent
...
Sort some slice fields before sending them to the swarm api so that it
won't trigger an update.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-27 16:09:02 +01:00
485a2b2b2f
Set default values for uid and gid to prevent errors when starting a service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 12:00:46 -05:00
682d75fa3f
Test and fix external secrets in stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
0382f4f365
Implement secret types for compose file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
74c29fde04
Add error checking for hostPort range
...
This fix catches the case where there is a single container port
and a dynamic host port and will fail out gracefully
Example docker-compose.yml snippet:
port:
ports:
- "8091-8093:8091"
- "80:8080"
Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
2017-01-13 18:05:51 -05:00
c2f0402f4d
Fix parsing resources from compose file for stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-09 14:22:02 -05:00
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
c4ea22972f
Move pkg to cli/compose/convert
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-16 12:27:31 -05:00
Aaron Lehmann
Elias Faxö
Daniel Nephin
Vincent Demeester
Daniel Nephin
allencloud
Yong Tang
Tony Abboud