8ea02f6f08
Merge pull request #477 from dnephin/some-tests-for-container-command
...
A few tests for container command
2017-08-30 09:38:38 -07:00
e02fcfd34e
Change the type of interval, timeout and start_period of healthcheck from string to * time.Duration
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2017-08-30 23:39:12 +08:00
e7f90b6b38
Reduce complexity in cli/command/container
...
Add tests for exec and cleanup existing tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 19:25:50 -04:00
bdc8cf364e
Add ulimits to unsupported compose fields.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 17:05:16 -04:00
0abdad615f
Support start_period for healthcheck in Docker Compose
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2017-08-29 11:19:29 +08:00
d318c4112b
Reduce complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-28 12:49:07 -04:00
d83752cdf2
Merge pull request #452 from dnephin/compose-allow-x-fields
...
Allow extension fields in the v3.4 version of the compose format
2017-08-25 12:37:47 -04:00
2a1857e899
Allow extension fields in the v3.4 version of the compose format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-22 10:42:49 -04:00
846a31aa50
Use new internal testutil.ErrorContains()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-22 10:14:25 -04:00
1667073908
Update schemas to prevent invalid properties in deploy.resources
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 15:58:51 -07:00
15837afa77
Replace pkg/testutil/tempfile with gotestyourself/fs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
eef256943b
Add network and target to build in v3.4
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 10:50:32 -04:00
1cd402b192
Merge pull request #360 from akalipetis/compose-update-order
...
Add support for update order in compose deployments
2017-08-01 22:24:48 +02:00
f386d476ba
Merge pull request #388 from christopherobin/feature/stopsignal
...
Add support for stop-signal in stack command
2017-08-01 09:53:13 +02:00
2950667f07
Support the "order" key in "update_config" for compose
...
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2017-07-28 22:50:55 +03:00
27a3080825
Change to enable volume name can be customized.
...
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Change to enable volume name can be customized.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Change to enable volume name can be customized.
Remove unused debug info.
Address comments from Daniel and solve the lint error.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Address Daniel's comments to print warning message when name of external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Remove the case that specifying external volume name in full-example.yml.
More fix.
Add unit test.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Address comments from Daniel, move the schema change to v3.4.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Address comments from Sebastiaan. Signed-off-by: Liping Xue <lipingxue@gmail.com>
Address comments from Misty.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
2017-07-27 15:09:05 -07:00
b129a70b5c
Add support for stop-signal in stack command
...
Signed-off-by: Christophe Robin <crobin@nekoo.com>
2017-07-27 13:18:05 +09:00
0adccacb38
Add Compose format 3.4
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-19 14:24:59 -07:00
d3f9a6c610
on_failure -> on-failure in compose code
...
on_failure should be on-failure
Signed-off-by: Charlie Drage <charlie@charliedrage.com>
2017-06-28 11:10:02 -04:00
732261f774
Use compose volume spec parser for container volume flag
...
Restore testcases for Volume spec parsing.
And correctly interpret the parsed volume.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:16:04 -04:00
db6ff357a7
Some improvements to compose volume spec parsing
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:13:52 -04:00
3724fb7f37
Add gosimple lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:55:08 -07:00
01e1e58ada
Add unused linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:54:27 -07:00
4d980880f3
Merge pull request #121 from nishanttotla/digest-pinning-stack-deploy
...
Enable client side digest pinning for stack deploy
2017-06-08 23:20:02 +03:00
c944d20b1f
Merge pull request #163 from vdemeester/export-convertservice
...
Update ConvertService for external usage 👼
2017-06-08 10:55:56 +02:00
96dc07a8cf
Update ConvertService for external usage 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-08 10:44:05 +02:00
f790e839fc
Change --no-resolve-image flag to --resolve-image string flag
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-06-07 12:30:11 -07:00
9f1bea2657
Enable client side digest pinning for stack deploy
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-06-07 12:30:11 -07:00
9d12d6fc87
Merge pull request #145 from dnephin/improve-compose-secrets-errors
...
Compose: Improve error messages when resource create/update fails
2017-06-07 18:51:10 +03:00
44ac80881f
Update vendoring of docker/docker
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-06 00:23:21 +02:00
97ebc19438
Use a map instad of a switch/case for Compose transform.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-01 15:22:09 -04:00
729d07a371
Compose: Improve error messages when resource creation/updates fail.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-01 15:03:04 -04:00
bf22fc6781
Merge pull request #136 from johnstep/fix_stack_service_volumes
...
Fix stack compose bind-mount volumes for Windows
2017-06-01 11:06:06 -04:00
9043d39dea
Fix stack compose bind-mount volumes for Windows
...
For stack compose files, use filepath.IsAbs instead of path.IsAbs, for
bind-mounted service volumes, because filepath.IsAbs handles Windows
paths, while path.IsAbs does not.
Signed-off-by: John Stephens <johnstep@docker.com>
2017-05-31 21:13:58 -07:00
efaadcf465
Merge pull request #132 from mavenugo/stack-host
...
Host and Bridge network support in docker stack deploy
2017-05-31 15:07:56 -07:00
b7cac96f69
Include stack service configs in service specs
...
Signed-off-by: John Stephens <johnstep@docker.com>
2017-05-26 21:41:04 -07:00
d5b505ee8c
Only set default aliases when the network is user defined.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-26 14:25:20 -04:00
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
e574286ba2
Add support for configs to compose format
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 17:10:14 -04:00
90809f8fd9
Merge pull request #71 from thaJeztah/add-credspec-to-compose
...
add credential-spec to compose
2017-05-16 16:45:06 -04:00
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
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
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
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
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
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
ef1d58dd87
Add check for compose bindata.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-09 15:42:22 -04:00
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
295140edf2
cli: gofmt + goimports
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-05-08 10:51:30 -07:00
57230a7212
rm client and vendor it instead
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-08 10:33:56 -07:00
9c02b38bec
Regenerate schema with the correct libraries
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-03 17:46:40 -07:00
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
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
8f73a12f9b
Add deadcode linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
10641c2aae
Update imports.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-17 18:07:56 -04:00
1630fc40f8
Import docker/docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-17 17:40:59 -04:00
Victor Vieux
Li Yi
Daniel Nephin
Li Yi
Daniel Nephin
Joffrey F
Sebastiaan van Stijn
Vincent Demeester
Antonis Kalipetis
Liping Xue
Christophe Robin
Charlie Drage
Aaron Lehmann
Vincent Demeester
Nishant Totla
Brian Goff
John Stephens
Madhu Venugopal
Sebastiaan van Stijn
Gaetan de Villele
Tibor Vass
Colin Hebert