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

2645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
7d22809ef4 Validate that each section of the config is a mapping before running interpolation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Anthon van der Neut
cfda9d844e for 1.6.0 the version value needs to be a string 
After conversion a file would immediately not load in docker-compose 1.6.0 with the message:

  ERROR: Version in "./converted.yml" is invalid - it should be a string.

Signed-off-by: Anthon van der Neut anthon@mnt.org
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-02-23 11:52:51 -08:00
Joffrey F
1e29ad9fc7 Apply driver_opts processing to network configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
fcf78fe3de Constraint build argument types. Numbers are cast into strings 
Numerical driver_opts are also valid and typecast into strings.
Additional config tests.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
8d7b1e9047 Update guides to use v2 config format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
6d2aa80435 Update link to docker volume create docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
13ec3d0217 Fix copying of volumes by using the name of the volume instead of the host path. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Anthon van der Neut
f59fef09a6 reset colors after warning 
If a warning is shown, and you happen to have no color setting in your (bash) prompt, the \033[37m setting, stays active. With the message hardly readable (light grey on my default light yellow background), that means the prompt is barely visible and you need to do `tput reset`.
Would probably be better if the background color was set as well in case you have dark on light theme by default in your terminal.

Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-02-23 11:52:51 -08:00
Chia-liang Kao
f0a8c65b05 Quote argv as they are 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-23 11:52:51 -08:00
Chia-liang Kao
674e541cf7 Detect -t and -i separately 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-23 11:52:51 -08:00
Chia-liang Kao
ed5fedf516 Don't mount pwd if it is / 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-23 11:52:51 -08:00
Joffrey F
654b3710f7 Use modern set notation in _get_aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
f4a22b94ed Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
e5689afe4c Network aliases are now part of the network dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
42cb719b52 Add v2_only decorator to network aliases test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
6ac6860dda Fix network list serialization in py3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
353da73eab Document network_aliases config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
c686be8fd3 Test network_aliases feature 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
2f7a77e954 Allow user to specify custom network aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
d78ea85301 driver_opts can only be of type string 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
7c95c733a9 Only set a container affinity if there are volumes to copy over. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
dd9a8d6eee Bring up all dependencies when running a single service. 
Added test for running a depends_on service

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
4f7c950ca8 Upgrade pyinstaller. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
a1d6e3b9e3 Add logging when initializing a volume. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
3eac70a9d3 Detailed error message when daemon version is too old. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Manuel Kaufmann
c7687592ff Typo fixed 
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
155efd28fa Merge build.args when merging services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
2ced83e3d9 Fix build section without context. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
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