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,637 Commits 21 Branches 282 Tags
Commit Graph

2637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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