beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32104 commits 14 branches 412 tags 338 MiB
Commit graph

76 commits

Author SHA1 Message Date
Tõnis Tiigi
22d9eadee2 Merge pull request #32564 from dnephin/compose-file-rel-dir 
Set Composefile WorkingDir to dirname of the composefile.
 2017-04-26 17:30:33 -07:00
Vincent Demeester
bb5dfdb8c5 Merge pull request #32632 from ColinHebert/compose_add_labels_during_build 
Add support for labels during build with compose
 2017-04-21 10:16:48 +02:00
Daniel Nephin
cad32e0111 Set Composefile WorkingDir to dirname of the composefile. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-17 15:14:58 -04:00
Colin Hebert
bddd9cce40 Regenerate schema with the correct libraries 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-04-15 13:00:23 +10:00
Colin Hebert
0ee58cb3b9 Run go generate github.com/docker/docker/cli/compose/schema 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-04-15 10:57:43 +10:00
Colin Hebert
1d1defa399 Add support for labels during build with compose 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-04-15 05:31:28 +10:00
Aaron Lehmann
6052f2b396 Remove pkg/testutil/assert in favor of testify 
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.

I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.

In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.

In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-14 12:03:21 -07:00
Vincent Demeester
8a8c1961b5 Merge pull request #32059 from seriousben/support-dns-stack-file 
add support for dns nameservers and search domains in stack files
 2017-04-11 21:32:52 +02:00
Benjamin Boudreau
6b60a60729
Adding support for dns in stack files 
Signed-off-by: Benjamin Boudreau <boudreau.benjamin@gmail.com>
 2017-04-10 20:46:33 -04:00
Sebastiaan van Stijn
b0831acb09 Merge pull request #32062 from aaronlehmann/change-network-attachments 
Support service network attachment changes
 2017-04-10 12:49:28 +02:00
Aaron Lehmann
b8e70747c6 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
Daniel Nephin
ae27355b09 Add support for volume consistency in compose format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-07 13:23:33 -04:00
Brian Goff
30cdabd13f Merge pull request #32407 from dnephin/fix-rw-mode-compose-files 
Support rw as a volume option in compose file
 2017-04-06 16:24:20 -04:00
Daniel Nephin
062830535d Support rw as a volume option in compose file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-06 10:32:35 -04:00
Elias Faxö
e401f63735 Added start period option to health check. 
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
 2017-04-06 12:35:34 +02:00
Daniel Nephin
25f00866e3 Fix endpoint mode in Compose format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-03 17:51:31 -04:00
Tibor Vass
0d08818653 Do not replace fmt.Errorf in generated file 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-03-27 18:33:41 -07:00
Daniel Nephin
7b7ea8ab81 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
Daniel Nephin
7236686987 Fix external volume error to pass validation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-24 16:55:04 -04:00
Daniel Nephin
b03a185723 Cleanup compose convert error messages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-24 10:43:28 -04:00
Vincent Demeester
c165a8bfa1
Make sure we error out instead of panic during interpolation 
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-23 16:09:57 +01:00
Vincent Demeester
d3dc27d145
Remove compose types.Dict alias 
It is just an alias type and make the code a little bit more complex
and hard to use from outside `compose` package.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-22 16:16:20 +01:00
Vincent Demeester
b8c45c3a57
Fixing a small typo in compose loader package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-20 15:39:57 +01:00
Vincent Demeester
8bc703804d Merge pull request #30781 from AkihiroSuda/fix-stack-env 
compose: fix environment interpolation from the client
 2017-03-17 15:56:50 +01:00
Akihiro Suda
2cdc9c42eb compose: update the comment about MappingWithEquals 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-17 06:21:55 +00:00
Sebastiaan van Stijn
d376b18caf Merge pull request #31896 from aaronlehmann/move-secretrequestoption 
api: Remove SecretRequestOption type
 2017-03-16 21:31:15 +01:00
Aaron Lehmann
e7c39f4d5d 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
Daniel Nephin
576d2181e4 Fix compose schema id for v3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-16 13:53:58 -04:00
Sebastiaan van Stijn
b0d1936d30 Merge pull request #31302 from dnephin/purge-orphaned-services 
Add --prune to stack deploy
 2017-03-15 12:57:06 +01:00
Anusha Ragunathan
95b46ff68f Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format 
docker stack deploy interpolation format error due to not escaping $ now includes a hint
 2017-03-14 17:14:09 -07:00
Daniel Nephin
644fd804fc Add --prune to stack deploy. 
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-14 16:09:28 -04:00
Daniel Nephin
a9c86b63c0 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
Akihiro Suda
ea43c33330 compose: fix environment interpolation from the client 
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-14 15:59:40 -04:00
Daniel Nephin
cd56476f18 Merge pull request #31795 from dnephin/compose-file-v3.2 
Compose file v3.2
 2017-03-14 14:10:24 -04:00
Justin Cormack
49376cddab Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy 
Add expanded mount format to stack deploy
 2017-03-14 17:53:28 +00:00
Daniel Nephin
e7bf5be18b Add compose file version 3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 16:20:42 -04:00
Daniel Nephin
751552c65f 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
allencloud
9679065728 support both endpoint modes in stack 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-13 15:00:49 -04:00
Sebastiaan van Stijn
8b02a15d52 Merge pull request #31176 from adshmh/29662-stack-deploy-error-if-external-combined-with-other-volume-options 
stack deploy exits with error if both 'external' and other options are specified for a volume
 2017-03-11 01:59:43 +01:00
Sebastiaan van Stijn
fb024df8f0 Merge pull request #31443 from james-nesbitt/export-more-compose-methods 
exported add. cli compose loader parsing methods
 2017-03-08 15:12:42 +01:00
Arash Deshmeh
96039b394a stack deploy exits with error if both 'external' and any other options are specified for volumes 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-03-07 14:21:45 -05:00
James Nesbitt
a1560a0cf2 exported cli compose loader parsing methods 
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com>
 2017-03-07 17:36:35 +02:00
Daniel Nephin
a1bbb2f7ea Convert new compose volume type to swarm mount type 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Daniel Nephin
190dc5a40a Support expanded mounts in Compose loader 
Add a test for loading expanded mount format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Daniel Nephin
32c955b8fe Parse a volume spec on the client, with support for windows drives 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Daniel Nephin
65c899bee5 Add expanded mount syntax to Compose schema and types. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Daniel Nephin
b7577dd2ad Support customizing the default network for a stack. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-24 17:32:23 -05:00
Arash Deshmeh
6d2a7eebcb docker compose interpolation format error now includes a hint on escaping $ characters. 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-02-24 11:37:40 -05:00
Brian Goff
8e57694452 Merge pull request #31088 from xulike666/make-code-readable-again 
Typo fixed and this time I provide my cSpell.json
 2017-02-16 22:04:27 -05:00
Brian Goff
a12454d7a9 Merge pull request #31006 from vdemeester/30991-secret-mode-in-stack-deploy 
Set 0444 as default secret mode in stack deploy
 2017-02-16 20:34:21 -05:00