tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,426 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

3426 Commits

Author SHA1 Message Date
Joffrey F 046144e8f4 Bump docker-py version to include latest patch 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:13:32 -07:00
Mike Dougherty 4871523d5e Update Jenkinsfile to perform existing jenkins tasks 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-10-25 11:51:02 -07:00
Aanand Prasad 505c785c5c Merge pull request from shin-/fix-schema-divergence 
Fix schema divergence - add missing fields to compose 2.1 schema
 2016-10-25 11:20:51 -07:00
Albin Kerouanton 99343fd76c Fix path of the parent dir of COMPOSE_FILE 
Signed-off-by: Albin Kerouanton <albin.kerouanton@knplabs.com>
 2016-10-25 11:09:45 +02:00
Aanand Prasad 8b5782ba9f Merge pull request from shin-/portable-find-exe 
Replace "which" calls with the portable find_executable function
 2016-10-24 16:15:21 -07:00
Aanand Prasad d586328812 Merge pull request from shin-/refine-swarm-warning 
Do not print Swarm mode warning when connecting to a UCP server
 2016-10-24 16:15:14 -07:00
Aanand Prasad 021bb41fc6 Merge pull request from shin-/project_tests_robustness 
Improve robustness of a couple integration tests with occasional failures
 2016-10-24 15:35:52 -07:00
Joffrey F 60d005b055 Improve robustness of a couple integration tests with occasional failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 13:58:45 -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 43e29b41c0 Fix schema divergence - add missing fields to compose 2.1 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 11:51:45 -07:00
Joffrey F a652b6818c Merge pull request from shin-/missing-2.1-spec 
Add missing config schema to docker-compose.spec
 2016-10-24 11:43:17 -07:00
Joffrey F ea68be3441 Do not print Swarm mode warning when connecting to a UCP server 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 11:36:44 -07:00
Joffrey F 2c24bc3a08 Add missing config schema to docker-compose.spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 10:55:04 -07:00
Michal Zdrojewski 3d8dc6f47a fix(docs): updated documentation links 
Signed-off-by: Michal Zdrojewski <code@strayobject.co.uk>
 2016-10-24 15:41:31 +01:00
Joffrey F f039c8b43c Update release process document to account for recent changes. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-20 17:47:07 -07:00
Joffrey F 3147090fb4 Merge pull request from shin-/npipe-fixes 
Bump docker-py dependency (includes several npipe fixes)
 2016-10-19 11:44:52 -07:00
Joffrey F de15ec835a Merge pull request from aanand/shell-out-attach 
Attach interactively on Windows by shelling out
 2016-10-19 11:14:36 -07:00
Joffrey F 2d3c76950f Merge pull request from shin-/fix-contributors-script 
Fix the contributors script
 2016-10-18 15:25:55 -07:00
Joffrey F 932b3cc10a Merge pull request from shin-/3923-windows-volumes 
Do not normalize volume paths on Windows by default
 2016-10-18 14:41:52 -07:00
Joffrey F db5d2bcb10 Merge pull request from shin-/fix-osx-build 
Fix openssl dependency in OSX binary build
 2016-10-18 14:14:30 -07:00
Joffrey F cd94c37f5d Fix merge error (missing Network.labels attribute) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-18 14:09:31 -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 f60c60205b Merge branch 'dbdd4us-master' 2016-10-17 14:09:40 -07: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 882084932d Upgrade docker-py to latest version 
Adjust required requests version

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-17 14:03:21 -07:00
Joffrey F a5c1e4b0cd Merge pull request from shin-/3906-isolation-config 
Add support for "isolation" in config
 2016-10-17 11:02:11 -07:00
Joffrey F 95c6cc0420 Merge pull request from shin-/3430-enable-ipv6 
Add support for enable_ipv6 in network definition.
 2016-10-17 11:02:00 -07:00
Joffrey F 50faddb683 Merge pull request from realab/fix-restart-with-null-string 
fix serialize restart spec with null string
 2016-10-14 14:34:35 -07:00
Aanand Prasad 925915eb25 Show clear error when docker binary can't be found 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-10-14 17:31:21 +01:00
Aanand Prasad 8314a48a2e Attach interactively on Windows by shelling out 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-10-14 17:31:21 +01:00
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 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 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 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 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 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 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
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 from dnephin/inplace_var_defaults 
Support inline default values for interpolation
 2016-10-05 14:22:02 -07:00
John Mulhausen 85d6d7955f Merge pull request 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
Matt Bray a37d99f201 Zsh completion: change --file description text 
Signed-off-by: Matt Bray <mattjbray@gmail.com>
 2016-09-30 00:45:46 +01:00