tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 23:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,594 Commits 21 Branches 282 Tags
Commit Graph

2594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
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
Daniel Nephin
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
mnowster
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
Daniel Nephin
514f0650b2 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-19 12:02:40 -04:00
Mazz Mosley
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
mnowster
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
Steve Durrheimer
20d34c8b14 Add zsh completion for 'docker-compose --x-networking --x-network-driver' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-19 10:38:22 -04:00
Daniel Nephin
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
Harald Albers
6f45eb7959 bash completion for networking options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-19 10:11:35 -04:00
Mazz Mosley
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
Corin Lawson
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
mnowster
1a97a8ef86 Merge pull request #2213 from viranch/trim-dockerfile 
Trim Dockerfile
 2015-10-19 12:08:20 +01:00
Steve Durrheimer
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
mnowster
bca018c50a Merge pull request #2211 from albers/completion-networking 
bash completion for networking options
 2015-10-19 11:23:03 +01:00
mnowster
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
Nicolas Delaby
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
Viranch Mehta
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
Viranch Mehta
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
Harald Albers
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
Harald Albers
43a89e1702 bash completion for networking options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-17 09:30:53 -07:00
Mazz Mosley
49b98fa111 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:52:32 -04:00
Daniel Nephin
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
Daniel Nephin
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
Cameron Eagans
6048630a11 docker-compose pull SERVICE should not pull SERVICE's dependencies 
Signed-off-by: Cameron Eagans <me@cweagans.net>
 2015-10-16 12:59:57 -04:00
Aanand Prasad
46de4411a7 Revert networking-related changes to getting started guides 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-16 12:59:57 -04:00
Karol Duleba
883f251e7d Docs for shorthand notation of extends. Issue #1989 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin
284cda087e Add missing merge for release branch. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin
b2f9c182f3 Fix some release docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin
558098d322 Add a script to generate contributor list. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 12:59:57 -04:00
Per Persson
6571e079b9 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-16 12:59:57 -04:00
Tim Butler
49ca23c034 Fix link to Release Process doc in README.md 
Signed-off-by: Tim Butler <tim.butler.au@gmail.com>
 2015-10-16 12:59:57 -04:00
mnowster
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
mnowster
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
Mazz Mosley
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
mnowster
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
Aanand Prasad
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
Cameron Eagans
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
Karol Duleba
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
Daniel Nephin
8f840a55de Merge pull request #2194 from dnephin/update_release_docs 
Update release docs
 2015-10-15 15:40:13 -04:00
mnowster
4d8b184b14 Merge pull request #2196 from md2perpe/patch-1 
Remove incorrectly placed comment
 2015-10-15 15:31:49 +01:00
mnowster
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
Per Persson
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
Tim Butler
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
Daniel Nephin
fbe8e76902 Add missing merge for release branch. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 15:24:05 -04:00
Daniel Nephin
58e6d4487a Fix some release docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 15:16:58 -04:00
Daniel Nephin
338f2f4507 Add a script to generate contributor list. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 15:14:04 -04:00
Daniel Nephin
709bd9c363 Bump 1.5.0rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.5.0rc1 		2015-10-14 12:59:31 -04:00
Daniel Nephin
8cecf2e02d Merge remote-tracking branch 'docker/release' into bump-1.5.0rc1 2015-10-14 12:59:25 -04:00
Daniel Nephin
0409b287ad Merge pull request #2191 from dnephin/networking 
Networking
 2015-10-14 12:31:26 -04:00
mnowster
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