Commit Graph
8 Commits
Author SHA1 Message Date
Daniel Nephin 00c772cac8 Add support for volume consistency in compose format.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 545ec64de7
Component: cli
2017-04-07 13:23:33 -04:00
Daniel Nephin 8cc3b14857 Cleanup compose convert error messages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c70387aebc
Component: cli
2017-03-24 10:43:28 -04:00
Daniel Nephin 19021e1a48 Convert new compose volume type to swarm mount type
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 63c3221dd3
Component: cli
2017-03-06 11:45:01 -05:00
bingshen.wbs 200980812d fix docker stack volume's nocopy parameter
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
Upstream-commit: 6887337d86
Component: cli
2017-02-15 19:46:27 +08:00
Daniel Nephin 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
Component: cli
2016-12-27 16:17:24 -05:00
Sebastiaan van Stijn 84caa86071 Improve validation for volume specs
The current validation only checked for the
number of elements in the volume-spec, however,
did not validate if the elements were empty.

Because of this, an empty volume-spec (""),
or volume spec only containing separators ("::")
would not be invalidated.

This adds a simple check for empty elements in
the volume-spec, and returns an error if
the spec is invalid.

A unit-test is also added to verify the behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1f57f07070
Component: cli
2016-12-19 01:50:08 +01:00
Sebastiaan van Stijn 58f845701a fix conversion of anonymous volumes in compose-file
the `convertVolumeToMount()` function did not take
anonymous volumes into account when converting
volume specifications to bind-mounts.

this resulted in the conversion to try to
look up an empty "source" volume, which
lead to an error;

    undefined volume:

this patch distinguishes "anonymous"
volumes from bind-mounts and named-volumes,
and skips further processing if no source
is defined (i.e. the volume is "anonymous").

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bc4590fd7d
Component: cli
2016-12-18 16:50:32 +01:00
Daniel Nephin 49a03faa44 Move pkg to cli/compose/convert
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c4ea22972f
Component: cli
2016-12-16 12:27:31 -05:00