Madhu Venugopal
123f0bfd98
With the introduction of node-local network support, docker services can
...
be attached to special networks such as host and bridge. This fix brings
in the required changes to make sure the stack file accepts these
networks as well.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2017-05-25 19:50:08 -07:00
Brian Goff
e574286ba2
Add support for configs to compose format
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-05-16 17:10:14 -04:00
Daniel Nephin
90809f8fd9
Merge pull request #71 from thaJeztah/add-credspec-to-compose
...
add credential-spec to compose
2017-05-16 16:45:06 -04:00
Sebastiaan van Stijn
4e7943646b
add credential-spec to compose
...
Signed-off-by: Michael Friis <friism@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-05-15 15:00:26 -04:00
Vincent Demeester
d7f6563efc
Update cli imports to using local package
...
Also, rename a bunch of variable to not *shadow* the `opts` package
name.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2017-05-15 14:45:19 +02:00
Sebastiaan van Stijn
bb1a403080
Merge pull request #70 from docker/compose-template-substitute-error-signature
...
Return an error instead of an `*InvalidTemplateError`
2017-05-12 16:51:37 +02:00
Vincent Demeester
3cac3ec9e0
Return an error instead of an *InvalidTemplateError
...
This mess things up using the `Substitute` method from
outside (i.e. the error is nil but not nil kinda)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2017-05-11 17:35:06 +02:00
Vincent Demeester
0ab760a136
Add support for read_only services in stack deploy
...
The `read_only` key in a composefile is not taken into account right
now. Now that services support `--read-only`, so should `stack deploy`
Ref: moby/moby#32994
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2017-05-11 17:32:52 +02:00
Sebastiaan van Stijn
131fe7dfb2
Move "labels" to compose 3.3 format
...
Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.
This patch moves the change to the 3.3 schema
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Colin Hebert <hebert.colin@gmail.com >
2017-05-11 08:30:48 +10:00
Daniel Nephin
ef1d58dd87
Add check for compose bindata.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-05-09 15:42:22 -04:00
Li Yi
b3459936db
Support placement preferences in stack deployment
...
Move of moby/moby#32743
Signed-off-by: Li Yi <denverdino@gmail.com >
2017-05-09 07:00:45 +08:00
Gaetan de Villele
295140edf2
cli: gofmt + goimports
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
2017-05-08 10:51:30 -07:00
Tibor Vass
57230a7212
rm client and vendor it instead
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2017-05-08 10:33:56 -07:00
Colin Hebert
9c02b38bec
Regenerate schema with the correct libraries
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com >
2017-05-03 17:46:40 -07:00
Colin Hebert
53b43f02e2
Run go generate github.com/docker/docker/cli/compose/schema
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com >
2017-05-03 17:46:40 -07:00
Colin Hebert
a2c8291e1e
Add support for labels during build with compose
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com >
2017-05-03 17:46:40 -07:00
Daniel Nephin
8f73a12f9b
Add deadcode linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-05-02 17:57:46 -04:00
Daniel Nephin
10641c2aae
Update imports.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-04-17 18:07:56 -04:00
Daniel Nephin
1630fc40f8
Import docker/docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2017-04-17 17:40:59 -04:00