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

2617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohan Graterol
cea7911f56 Typo into the doc with networks in yaml 
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
db12794b1c Fix upgrading url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
deeca57a0d Use 12 characters for the short id to match docker and fix backwards compatibility. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
cr7pt0gr4ph7
edcbe2eb4d Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. 
Signed-off-by: cr7pt0gr4ph7 <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski
ad00f3dd21 Handle the 'network_mode' key when merging multiple compose files. 
Fixes docker/compose#2840.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski
c77a8cfe3b Correctly merge the 'services/<service>/networks' key in the case of multiple compose files. 
Fixes docker/compose#2839.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski
8548b75582 Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. 
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Michael Käufl
c1be49ad53 Used absolute links in readme 
This prevents links being broken on pypi
(e.g. https://pypi.python.org/pypi/docs/index.md#features)

Signed-off-by: Michael Käufl <docker-compose@c.michael-kaeufl.de>
 2016-02-23 11:52:51 -08:00
Aanand Prasad
a716bdc482 Update Swarm integration guide and make it an official part of the docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
abec6f5891 Change special case from '_', None to () 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
c195915263 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
34d8f9b55a Mangle the tests. They pass for better or worse! 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
f5533c1ed8 If an env var is passthrough but not defined on the host don't set it. This doesn't change too much code and keeps the generators. 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
722e3a2fc7 Merge remote-tracking branch 'docker/release' into bump-1.6.1 2016-02-23 11:15:34 -08:00
Aanand Prasad
9503aa2b5f Merge pull request #2821 from aanand/bump-1.6.0 
Bump 1.6.0
 2016-02-04 20:20:58 +00:00
Aanand Prasad
d99cad60e7 Bump 1.6.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1.6.0 		2016-02-04 19:43:26 +00:00
Ben Firshman
8199c4a6e1 Improve names in Compose file 2 example 
Just makes it a bit clearer what's going on.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-02-04 19:43:26 +00:00
Aanand Prasad
19ae76a442 Update docker-py and dockerpty 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:41:11 +00:00
Daniel Nephin
a55210413c Update docs for version being a string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-04 17:21:15 +00:00
Spencer Rinehart
6caa188730 Fix example formatting for depends_on. 
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.

I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file.  It resets the markdown indentation in a way that works.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-04 15:57:29 +00:00
Aanand Prasad
413a55aa71 Connect container to networks before starting it 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 14:43:11 +00:00
Dimitar Bonev
64336615cf Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-02-03 18:21:44 +00:00
Mary Anthony
a59982eb11 Fixing duplicate identifiers 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
46f33f12b0 Update merge docs with depends_on, and correction about how links and volumes_from are merged. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
dc718eae65 Make links unique-by-alias when merging 
Factor out MergeDict from merge_service_dicts to reduce complexity below limit.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
aa5ff05463 Fix merging of lists with multiple files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Ryan Taylor Long
3b7471ae84 Add depends_on to ALLOWED_KEYS 
This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`.

Signed-off-by: Ryan Taylor Long <ryan@rtlong.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
7f009aeeb9 Move command reference to overview. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
44c7d080bd Rename the old environment variable page to link environment variables. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
32bd760526 Cleanup command-line reference docs by renaming overview to envvars. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
009dbbe971 Use the same capitalization for all menu items in the docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
6b59ba0c31 Re-order compose docs so that quickstart guides come before other documentation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
61d00ebee4 Extract volume init and removal from project. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3b1276bd44 Include networks in the config_hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3e8a4a5dc3 Don't initialize networks that aren't used by any services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
0c87e0b18f Refactor project network initlization. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
8024f2f09e Tweak and test warning shown when version is a dict 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
f081376067 Improve error messages for invalid versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
ce0d469c18 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
b2ee08f439 Remove redundant check - self.config should never be None 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
e9ba06ed4b Normalise/fix config field designators in validation messages 
- Instead of "Service 'web' configuration key 'image'", just say
  "web.image"

- Fix the "Service 'services'" bug in the v2 file format

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
9e9b36460c Convert validation error tests to pytest style 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Harald Albers
25df0d8147 bash completion for docker-compose create 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-02-01 15:53:22 +00:00
Steve Durrheimer
c98c617c30 Add zsh completion for 'docker-compose create' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-02-01 15:53:22 +00:00
Aanand Prasad
d3cd9213c1 Fix rebase-bump-commit script 
Trim whitespace from wc's output before constructing arguments to `git rebase`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:16 +00:00
Daniel Nephin
bbaae11a0f Fix race condition with up and setting signal handlers. 
Also print stdout on wait_for_container().

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-01 15:51:16 +00:00
Harald Albers
e925b8272b Fix computation of service list in bash completion 
The previous approach assumed that the service list could be extracted
from a single file. It did not follow extends and overrides.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-02-01 15:51:16 +00:00
Aanand Prasad
110401b6f0 Let the user specify any repo as their fork 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:16 +00:00
Aanand Prasad
8fb90bd732 Default to vim if EDITOR is not set 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Daniel Nephin
24e71db345 Don't copy over volumes that were previously host volumes, and are now container volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-01 15:51:15 +00:00