tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,712 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

3712 Commits

Author SHA1 Message Date
Aanand Prasad 8b383ad795 Refactor "docker not found" message generation, add Windows message 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-10-14 17:31:21 +01:00
realityone 22d91f60be
fix serialize restart spec with null string 
Signed-off-by: realityone <realityone@me.com>
 2016-10-14 18:20:55 +08: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 e4bb9bde30 Merge pull request #3964 from shin-/3963-unicode-env 
Don't break when interpolating environment with unicode characters
 2016-10-11 12:00:36 -07: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 e5ded6ff9b Add support for enable_ipv6 in network definition. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-06 15:49:08 -07:00
Joffrey F 804555bc4d Merge pull request #4015 from dnephin/fix-inline-defaults 
Support non-alphanumeric default values.
 2016-10-06 15:46: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
Victoria Bialas 8f636d8279 Merge pull request #4010 from londoncalling/add-vnext-info 
updated README per vnext branch plan
 2016-10-05 18:47:00 -07:00
Joffrey F b50b14f937 Fix openssl dependency in OSX binary build 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-05 17:08:14 -07:00
Joffrey F 54103dc954 Merge pull request #4009 from shin-/update-openssl-mac 
Use latest OpenSSL version (1.0.2j) when building Mac binary on Travis
 2016-10-05 17:07:13 -07:00
Joffrey F 28546d1f81 Use latest OpenSSL version (1.0.2j) when building Mac binary on Travis 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-05 16:26:17 -07:00
Victoria Bialas a8ff4285d1 updated README per vnext branch plan 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-10-05 16:19:09 -07:00
Joffrey F eac01a7cd5 Merge pull request #3108 from dnephin/inplace_var_defaults 
Support inline default values for interpolation
 2016-10-05 14:22:02 -07:00
Joffrey F 08f1ea7a93 Merge pull request #3967 from docker/bump-1.8.1 
Bump 1.8.1
 2016-10-05 14:21:15 -07:00
John Mulhausen 85d6d7955f Merge pull request #4005 from johndmulhausen/master 
Remove old documentation source, add README on migration
 2016-10-04 19:08:36 -07:00
John Mulhausen 1a4e81920b Remove old documentation source, add README on migration 
Signed-off-by: John Mulhausen <john@docker.com>
 2016-10-04 17:58:44 -07: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 b05c6c6fe9 Fix openssl dependency in OSX binary build 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 13:13:04 -07:00
Joffrey F de90765531 Bump 1.8.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 12:17:05 -07:00
Joffrey F 5667de87e8 Fix the contributors script to show only contributors on the current branch 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-22 12:34:59 -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 e216a31f1e Bump docker-py dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F e8903da96c Force default host on windows to the default TCP host (instead of npipe) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Aanand Prasad 613e060f0d Fix integration test on Docker for Mac 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 070f8b3992 Only allow log streaming if logdriver is json-file or journald 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 016197c16e Catch APIError while printing container logs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 6abdd9cc32 Update docker-py dependency to latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F fd7c16f1a4 Improve volumespec parsing on windows platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 20a511e961 Fix command hint in bundle to pull services instead of images 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 9e18929d60 Remove surrounding quotes from TLS paths, if present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
JG² 4b17aa1b9e Update rm.md 
Receiving this message when using the -a flag : `--all flag is obsolete. This is now the default behavior of `docker-compose rm`, I proposed to mark it in the docs but I don't know which way is the best

Signed-off-by: jgsqware <garciagonzalez.julien@gmail.com>
 2016-09-21 15:06:19 -07:00
Joffrey F bd7db570bd Catchable error for parse failures in split_buffer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 1c07d6453f 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-09-21 15:06:19 -07:00
Aanand Prasad 093b040b8e Fix stacktrace when handling timeout error 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-21 15:06:19 -07:00
Aanand Prasad b801f275d7 Shell completion for --push-images 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-21 15:06:19 -07:00
Daniel Nephin 5b27389571 Merge pull request #3956 from shin-/update_dockerpy_version 
Bump docker-py dependency
 2016-09-21 10:08:48 -04:00
Joffrey F 53fa44c01e Don't break when interpolating environment with unicode characters 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 18:05:59 -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 33424189d4 Denormalize function defaults to latest version 
Minor docs fix

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 11:47:14 -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 fc6791f3f0 Bump docker-py dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-16 14:12:15 -07:00
Joffrey F 1d03baa9b1 Merge pull request #3954 from shin-/windows_tcp_default 
Force default host on windows to the default TCP host (instead of npipe)
 2016-09-16 14:09:10 -07:00