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

806 Commits

Author SHA1 Message Date
Daniel Nephin
6cac48c056 Add a vendored and modified pytimeparse 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-16 12:10:32 -05:00
Aanand Prasad
d717c88b6e Support version 3.0 of the Compose file format 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-16 16:07:02 +00:00
Joffrey F
721bf89447 Merge pull request #4134 from shin-/fix_none_opts_network_check 
Avoid breaking when remote driver options are null
 2016-11-15 15:01:24 -08:00
Joffrey F
7f60ff5ae6 Avoid breaking when remote driver options are null. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 12:00:52 -08:00
Aanand Prasad
ba249e5179 Test that values in 'environment' override env files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-09 15:10:27 +00:00
Joffrey F
10417eebd7 Fix logging dict merging 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-03 17:22:31 -07:00
Joffrey F
ba43d08fbd Add whitelisted driver option added by the overlay driver to avoid breakage 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-01 11:47:12 -07:00
Joffrey F
d2fb146913 Replace "which" calls with the portable find_executable function 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 13:22:52 -07:00
Joffrey F
efb09af271 Do not normalize volume paths on Windows by default 
Add environment variable to enable normalization if needed.
Do not normalize internal paths

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-18 12:17:56 -07:00
Nicolas Barbey
086ae04b9e Fix TypeError : unorderable types: str() < int() 
While merging list items into a set, strings and ints are compared which is not possible.
We cast everything to strings to avoid the issue.

The issue was seen with python 3.5 while overriding configuration files
with heterogenous port types (int in one file, string in another).

Signed-off-by: Nicolas Barbey <nicolas.a.barbey@gmail.com>
 2016-10-18 12:01:00 +02:00
Joffrey F
14716bc2da Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master 2016-10-17 14:09:09 -07:00
Joffrey F
a5c1e4b0cd Merge pull request #3991 from shin-/3906-isolation-config 
Add support for "isolation" in config
 2016-10-17 11:02:11 -07:00
dbdd
bdcce13f4a add support for creating volume and network with label definition 
Signed-off-by: dbdd <wangtong2712@gmail.com>
 2016-10-12 10:35:14 +08:00
Joffrey F
7f1606545d Merge pull request #4004 from shin-/4000-extend-logging 
Properly merge logging dictionaries in overriding configs
 2016-10-11 12:00:06 -07:00
Joffrey F
0603b445e2 Properly merge logging dictionaries in overriding configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-10 15:39:05 -07:00
Joffrey F
9248298a4a Merge pull request #4016 from shin-/4008-unicode-formatter 
Handle formatter case where logrecord message is binary containing unicode
 2016-10-06 16:49:03 -07:00
Joffrey F
bc3ed6dead Merge pull request #3992 from shin-/3701-npipe-windows-default 
Use docker-py's default behavior when no explicit host on Windows
 2016-10-06 16:48:35 -07:00
Joffrey F
17c5b45641 Handle formatter case where logrecord message is binary containing 
unicode characters.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-06 15:39:47 -07:00
Daniel Nephin
2bce81508e Support non-alphanumeric default values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-06 17:04:19 -04:00
Daniel Nephin
fe08be698d Support inline default values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-29 12:46:11 -04:00
Joffrey F
007cf96452 Use docker-py's default behavior when no explicit host on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 15:36:57 -07:00
Joffrey F
dc8a39f70d Add support for "isolation" in config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 15:31:58 -07:00
Joffrey F
f65f89ad8c Merge pull request #3653 from shin-/3637-link-local-ips 
Add support for link-local IPs in service.networks definition
 2016-09-22 11:58:29 -07:00
Joffrey F
7687412e03 Merge pull request #3922 from shin-/3897-volumespec_parse_win32 
Improve volumespec parsing on windows platforms
 2016-09-20 13:09:37 -07:00
Joffrey F
7911659266 Improve volumespec parsing on windows platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 11:24:24 -07:00
Joffrey F
1648a3e257 Merge pull request #3709 from Knetic/groupadd 
Supported group_add
 2016-09-19 17:18:06 -07:00
Joffrey F
64517e31fc Force default host on windows to the default TCP host (instead of npipe) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-16 11:43:25 -07:00
Joffrey F
fd254caa68 Add support for link-local IPs in service.networks definition 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-15 14:55:14 -07:00
Joffrey F
651283eef9 Merge pull request #3941 from shin-/3888-recover-apierror-logs 
Catch APIError while printing container logs
 2016-09-13 12:58:40 -07:00
Joffrey F
f065ce0f73 Merge pull request #3942 from shin-/3873-syslog-logs-error 
Only allow log streaming if logdriver is json-file
 2016-09-13 12:28:27 -07:00
Joffrey F
3fcd648ba2 Catch APIError while printing container logs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-13 12:10:41 -07:00
Joffrey F
7dd2e33057 Only allow log streaming if logdriver is json-file or journald 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-13 11:56:26 -07:00
Aanand Prasad
9759f27fa6 Fix integration test on Docker for Mac 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-13 14:50:37 +01:00
George Lester
dada36f732 Supported group_add 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-09-11 23:10:49 -07:00
Joffrey F
3dec600d82 Merge pull request #3830 from shin-/3534-machine-config-args 
Remove surrounding quotes from TLS paths, if present
 2016-09-07 18:35:43 -07:00
Jean-François Roche
d824cb9b06 Add support for swappiness constraint 
Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/)

refs #2383

Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
 2016-08-16 11:02:51 +02:00
Joffrey F
c0305024f5 Remove surrounding quotes from TLS paths, if present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-09 15:13:01 -07:00
Aanand Prasad
d29f8e1022 Merge pull request #3789 from shin-/3788-json-splitter-fix 
json_splitter: Don't break when buffer contains leading whitespace.
 2016-08-03 13:23:52 +01:00
Joffrey F
6f4be1cffc json_splitter: Don't break when buffer contains leading whitespace. 
Add error logging with detailed output for decode errors

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-29 14:05:59 -07:00
Aanand Prasad
5aeeecb6f2 Fix stacktrace when handling timeout error 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-29 17:12:46 +01:00
Aanand Prasad
e9d62e8404 Merge pull request #3676 from aanand/warn-for-swarm-mode 
Show a warning when engine is in swarm mode
 2016-07-27 15:38:09 +01:00
Ben Firshman
1877a41b92
Add user agent to API calls 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 14:26:15 +01:00
Aanand Prasad
887ed8d1b6 Rename --fetch-digests to --push-images and remove auto-pull 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-25 17:36:24 +01:00
Aanand Prasad
2c9e46f60f Show a warning when engine is in swarm mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-25 13:46:56 +01:00
Daniel Nephin
619bf4c4df Merge pull request #3705 from aanand/fix-timeout-message 
Fix timeout value in error message
 2016-07-22 10:57:41 -04:00
Jonathan Giannuzzi
83f35e132b Add support for creating internal networks 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-07-11 11:34:01 +02:00
Aanand Prasad
4207d43b85 Fix timeout value in error message 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-07 12:08:47 -07:00
George Lester
6fe5d2b543 Implemented oom_score_adj 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-07-05 23:43:32 -07:00
Daniel Nephin
95207561bb Add some unit tests for new bundle and push commands. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-28 10:18:20 -04:00
Joffrey F
ee68a51e28 Skip TLS version test if TLSv1_2 is not available on platform 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-14 12:23:04 -07:00