tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-16 10:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,517 Commits 20 Branches 280 Tags
Commit Graph

830 Commits

Author SHA1 Message Date
Kevin Greene
22d90d2180 Added ulimits functionality to docker compose 
Signed-off-by: Kevin Greene <kevin@spantree.net>
 2015-11-10 14:07:04 -05:00
Daniel Nephin
a8ac6e6f93 Add a warning when the host volume config is being ignored. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 13:48:53 -05:00
Adrian Budau
c5c36d8b00 Added --force-rm to compose build. 
It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.

Signed-off-by: Adrian Budau <budau.adi@gmail.com>
 2015-11-10 13:05:04 -05:00
Daniel Nephin
45724fc667 Only create the default network if at least one service needs it. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 12:43:55 -05:00
Daniel Nephin
c8fa0a902a Merge pull request #2331 from dnephin/flush_log_buffer_when_printing_logs 
Flush the log stream after writing each line
 2015-11-10 12:34:42 -05:00
Aanand Prasad
917b885a44 Merge pull request #2334 from dnephin/dont_set_hostname 
Don't set the hostname to the service name with networking.
 2015-11-10 17:34:02 +00:00
Daniel Nephin
b09cf86dd6 Merge pull request #2326 from dnephin/unicode_decode_error 
Unicode decode error
 2015-11-10 12:29:52 -05:00
Joffrey F
774d852f93 Merge pull request #2335 from dnephin/volumes_refactoring 
Some small refactoring around volumes
 2015-11-09 14:05:52 -08:00
Joffrey F
a1e140f5a3 Update service config_dict computation to include volumes_from mode 
Ensure config_hash is updated when volumes_from mode is changed, and
service is recreated on next up as a result.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-09 13:07:26 -08:00
Daniel Nephin
ec22d98377 Use VolumeSpec instead of re-parsing the volume string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 18:11:56 -05:00
Daniel Nephin
0e19c92e82 Make working_dir consistent in the config package. 
- make it a positional arg, since it's required
- make it the first argument for all functions that require it
- remove an unnecessary one-line function that was only called in one place

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 18:11:56 -05:00
Daniel Nephin
3456002aef Don't set the hostname to the service name with networking. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 17:50:32 -05:00
Daniel Nephin
d32bb8efee Fix #1549 - flush after each line of logs. 
Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 15:33:42 -05:00
Daniel Nephin
26c7dd3712 Handle non-utf8 unicode without raising an error. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 12:56:36 -05:00
Daniel Nephin
8ff960afd1 Fix service recreate when image changes to build. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -05:00
Daniel Nephin
841ed4ed21 Remove the duplicate 'Warning' prefix now that the logger adds the prefix. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 14:18:28 -04:00
Daniel Nephin
d836973a04 Use colors when logging warnings or errors, so they are more obvious. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 14:06:50 -04:00
Mazz Mosley
5dc14f3925 Handle non-ascii chars in volume directories 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-29 12:05:51 +00:00
Daniel Nephin
b6b9b002e5 Merge pull request #2254 from mnowster/1756-dont-display-output-from-previous-runs 
1756 dont display output from previous runs
 2015-10-27 18:45:47 -04:00
Mazz Mosley
bee063c07d Fix tests 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Daniel Nephin
7878d38dee Fix running one-off containers with --x-networking by disabling linking to self. 
docker create fails if networking and links are used together.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-27 11:11:15 -04:00
mnowster
5d60fbe31e Merge pull request #1659 from viranch/hostip-random-port 
Allow scaling services that have port binding of the form `host_ip::container_port`
 2015-10-23 17:11:28 +01:00
Daniel Nephin
ae47435425 Fix unicode in environment variables for python2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-22 12:12:43 -04:00
mnowster
fb69391889 Merge pull request #2233 from dnephin/some_unit_test_cleanup 
Cleanup some unit tests and whitespace
 2015-10-21 10:39:28 +01:00
Daniel Nephin
b1f8ed84a3 Cleanup some unit tests and whitespace. 
Remove some unnecessary newlines.
Remove a unittest that was attempting to test behaviour that was removed a while ago, so isn't testing anything.
Updated some unit tests to use mocks instead of a custom fake.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 14:23:56 -04:00
Daniel Nephin
3f0e083585 Force windows drives to be lowercase. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 11:39:06 -04:00
mnowster
5ed9f9bdf7 Merge pull request #2206 from dnephin/fix_extends_from_second_file 
extends must be copied from override file
 2015-10-20 10:22:58 +01:00
Daniel Nephin
3725c3ab7e Merge pull request #2225 from mnowster/2221-blank-env-vars 
2221 allow empty environment keys
 2015-10-19 14:06:31 -04:00
Daniel Nephin
938d49cbdc Fixes #2205 - extends must be copied from override file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 13:41:58 -04:00
Daniel Nephin
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
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
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
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
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
Aanand Prasad
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
Daniel Nephin
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
Mazz Mosley
ca36628a0e Test cgroup_parent option is being sent. 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-14 15:02:42 +01:00
Mohit Soni
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
Karol Duleba
c7ffbf97c8 Extend oneOf error handling. Issue #1989 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-10-14 14:31:35 +01:00
Mazz Mosley
c1d5ecaafe Workaround splitdrive limitations 
splitdrive doesn't handle relative paths, so if volume_path contains
a relative path, we handle that differently and manually set drive to ''.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-13 17:27:25 +01:00
Mazz Mosley
8efc39e616 Improve boolean warning message. 
Including examples of more boolean types, eg yes/N as it's not
always immediately clear that they are treated as booleans.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 14:59:08 +01:00
Aanand Prasad
627f1acdc4 Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from 
1188 support ro options in volumes from
 2015-10-07 11:57:14 +01:00
Mazz Mosley
f9028703f4 Pick the first container 
Rather than inefficiently looping through all the containers that a
service has and overriding each volumes_from value, pick the first
one and return that.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Mazz Mosley
467c731869 address PR feedback 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Aanand Prasad
fda615008c Merge pull request #2142 from dnephin/fix_error_cant_connect 
Fix error when compose can't connect to docker
 2015-10-07 11:22:32 +01:00
Daniel Nephin
15d0c60a73 Fix split buffer with inconsistently delimited json objects. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:43:07 -04:00
Daniel Nephin
3661e8bc74 Fix build against the swarm cluster by joining buffered output before parsing json. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:37:05 -04:00
Vincent Demeester
5b55a08846 Add support for ro option in volumes_from 
Fixes #1188

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-06 13:12:55 +01:00
Daniel Nephin
fbaea58fc1 Fix #2133 - fix call to get_client() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-05 15:57:49 -04:00