937e087c6c
Fixes #2203 - properly validate files when multiple files are used.
...
Remove the single-use decorators so the functionality can be used directly as a function.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-19 12:39:45 -04:00
cd0b63879b
Merge pull request #2208 from dnephin/another_release_script_fix
...
Fix check for tags in release script `make-branch`
2015-10-19 12:34:25 -04:00
129e2f9482
Fix check for tags.
...
If there is a branch with the same name as a tag it fails without the
--tags. This was only a problem when we're branching from a git tag.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-19 12:33:25 -04:00
a75bdfe11c
Merge pull request #2220 from ticosax/trove-classifire
...
Add trove classifier to declare supported python versions.
2015-10-19 17:20:31 +01:00
08add665e9
Environment keys can contain empty values
...
Environment keys that contain no value, get populated with values taken
from the environment not from the build phase but from running the command `up`.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-19 16:32:12 +01:00
159cddf563
Merge pull request #2209 from dnephin/fix_error_on_invalid_yaml
...
Give the user a better error message when the yaml file is invalid
2015-10-19 16:29:36 +01:00
076b5bc31c
Merge pull request #2197 from sdurrheimer/zsh-completion-network-options
...
Add zsh completion for 'docker-compose --x-networking --x-network-dri…
2015-10-19 10:37:57 -04:00
ff83c459d0
Improve error message for type constraints
...
It was missing a space between the different types, when there
were 3 possible type values.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-19 14:36:56 +01:00
4d8e667c3e
Powershell script to run compose in a container.
...
This script assumes the typical environment that Windows users operate,
namely, VirtualBox running the boot2docker ISO, managed by
docker-machine. I wrote this script for my Windows using colleagues and
first placed it in the public domain as a gist:
https://gist.github.com/au-phiware/25213e72c80040f398ba
In short, that script works for me.
I have adapted that script to use the (yet to be) official image
(docker/compose:latest) and also added an extra environment variable to
provide additional options to docker run.
Signed-off-by: Corin Lawson <corin@phiware.com.au>
2015-10-19 22:32:35 +11:00
1a97a8ef86
Merge pull request #2213 from viranch/trim-dockerfile
...
Trim Dockerfile
2015-10-19 12:08:20 +01:00
ac06366ef9
Add zsh completion for 'docker-compose --x-networking --x-network-driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-19 12:31:17 +02:00
bca018c50a
Merge pull request #2211 from albers/completion-networking
...
bash completion for networking options
2015-10-19 11:23:03 +01:00
2516aa8e08
Merge pull request #2212 from albers/completion-nospace
...
fix problem with bash completion in old bash
2015-10-19 11:22:44 +01:00
37921b40dd
Add trove classifier to declare supported python versions.
...
Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
2015-10-19 10:52:39 +02:00
07e9f6500c
Pipe curl's download directly to extract/execute program to reduce number of commands
...
Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
2015-10-18 01:06:50 +05:30
258c8bc54d
Fix specifies_host_port() to handle port binding with host IP but no host port
...
Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
2015-10-18 00:40:51 +05:30
fa44a5fac2
fix problem with bash completion in old bash
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-17 09:51:37 -07:00
43a89e1702
bash completion for networking options
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-17 09:30:53 -07:00
ae3c66baed
Merge pull request #2204 from mnowster/2123-escaping-env-variables
...
Attempt to document escaping env vars
2015-10-16 15:51:58 -04:00
26dc0b785b
Give the user a better error message (without a stack trace) when there is a yaml error.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-16 15:05:06 -04:00
4b939d3560
Merge pull request #2199 from cweagans/1752-docker-compose-pull-service-nodeps
...
docker-compose pull SERVICE should not pull SERVICE's dependencies
2015-10-16 17:12:28 +01:00
a712d828d4
Merge pull request #2200 from aanand/revert-tutorials
...
Revert networking-related changes to getting started guides
2015-10-16 17:06:31 +01:00
7b109bc026
Attempt to document escaping env vars
...
People are likely to run into their env vars being set to empty strings,
if they're not aware that they need to escape them for Compose to not
interpolate them.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-16 15:32:02 +01:00
b0c895c5f5
Merge pull request #2193 from mrfuxi/less-verbose-extends-docs
...
Docs for shorthand notation of extends. Issue #1989
2015-10-16 10:25:10 +01:00
1ed23fb2de
Revert networking-related changes to getting started guides
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-16 11:58:27 +05:30
53fc6d06f6
docker-compose pull SERVICE should not pull SERVICE's dependencies
...
Signed-off-by: Cameron Eagans <me@cweagans.net>
2015-10-15 17:33:32 -06:00
ccfb6e6fa8
Docs for shorthand notation of extends. Issue #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-10-15 22:17:13 +01:00
8f840a55de
Merge pull request #2194 from dnephin/update_release_docs
...
Update release docs
2015-10-15 15:40:13 -04:00
4d8b184b14
Merge pull request #2196 from md2perpe/patch-1
...
Remove incorrectly placed comment
2015-10-15 15:31:49 +01:00
971bfd403e
Merge pull request #2195 from timbutler/master
...
Fix link to Release Process doc in README.md
2015-10-15 15:30:00 +01:00
c6ff81fe30
Remove incorrectly placed comment
...
I'm not sure if it should be there at all, but at least it should hardly be where it currently is located.
Signed-off-by: Per Persson <per.persson@exertisztorm.com>
2015-10-15 15:25:52 +02:00
7e59a7ea32
Fix link to Release Process doc in README.md
...
Signed-off-by: Tim Butler <tim.butler.au@gmail.com>
2015-10-15 17:09:57 +10:00
fbe8e76902
Add missing merge for release branch.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:24:05 -04:00
58e6d4487a
Fix some release docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:16:58 -04:00
338f2f4507
Add a script to generate contributor list.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:14:04 -04:00
0409b287ad
Merge pull request #2191 from dnephin/networking
...
Networking
2015-10-14 12:31:26 -04:00
6b68a84b9b
Merge pull request #2019 from mrfuxi/less-verbose-extends
...
Allow to extend service using shorthand notation. Closes #1989
2015-10-14 17:13:09 +01:00
e2f792c4f4
If -x-networking is used, set the correct API version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 12:09:50 -04:00
d5f5eb1924
Enable use of Docker networking with the --x-networking flag
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-14 11:19:43 -04:00
f228173660
Print docker version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 11:18:21 -04:00
7c6e7e0dce
Update docker-py to 1.5.0
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 11:18:21 -04:00
b9c76dfabd
Merge pull request #2181 from mnowster/2128-split-drive-not-handling-relative-paths
...
2128 split drive not handling relative paths
2015-10-14 11:04:42 -04:00
f1e3c7b8b8
Merge pull request #2189 from mnowster/support-for-cgroup_parent
...
Support for cgroup parent
2015-10-14 10:59:04 -04:00
ca36628a0e
Test cgroup_parent option is being sent.
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-14 15:02:42 +01:00
f4efa29377
Added support for cgroup_parent
...
This change adds cgroup-parent support to compose project. It allows
each service to specify a 'cgroup_parent' option.
Signed-off-by: Mohit Soni <mosoni@paypal.com>
2015-10-14 15:02:42 +01:00
26ff729696
Merge pull request #2164 from dnephin/rename_compose_reference
...
Rename "yml reference" to "Compose file reference"
2015-10-14 14:58:35 +01:00
fbfbe60246
Rename yml.md to compose-file.md and add an alias for the old url.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:51:34 -04:00
01f44efe0d
Re-arrange volume_driver in compose file reference.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:50:37 -04:00
e6344f819a
Rename yaml reference to compose file reference.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:50:37 -04:00
c7ffbf97c8
Extend oneOf error handling. Issue #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-10-14 14:31:35 +01:00
Daniel Nephin
Daniel Nephin
mnowster
Mazz Mosley
Corin Lawson
Steve Durrheimer
Nicolas Delaby
Viranch Mehta
Harald Albers
Aanand Prasad
Cameron Eagans
Karol Duleba
Per Persson
Tim Butler
Mohit Soni