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

4075 Commits

Author SHA1 Message Date
Mike Dougherty f9dfb006b5 Update Jenkinsfile to perform existing jenkins tasks 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-11-03 13:49:03 -07:00
Joffrey F 969abca47f Merge pull request #4098 from shin-/fix_overlay_options_mismatch 
Add whitelisted driver option added by the overlay driver
 2016-11-03 11:43:11 -07:00
Joffrey F d525dd1846 Merge pull request #4104 from shin-/bump_docker_py 
Bump docker-py
 2016-11-03 11:43:04 -07:00
Joffrey F e6985de971 Add whitelisted driver option added by the overlay driver to avoid breakage 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-02 17:04:52 -07:00
Joffrey F e002171ab1 Updated docker-py dependency to latest version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-02 17:04:52 -07:00
Joffrey F f89ca3e147 Merge remote-tracking branch 'source/release' into bump-1.9.0-rc3 2016-11-02 16:58:55 -07:00
Joffrey F 7a430dbe96 Updated docker-py dependency to latest version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-02 16:56:45 -07:00
Joffrey F 3b46a62f36 Merge pull request #4073 from mikedougherty/jenkinsfile 
Update Jenkinsfile to run "janky" tasks
 2016-11-02 14:55:11 -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 ed71391f66 Merge pull request #4062 from strayobject/patch-1 
fix(docs): updated documentation links
 2016-10-28 11:55:58 -07:00
Joffrey F 24e9f66d79 Merge pull request #4086 from docker/bump-1.9.0-rc2 
Bump 1.9.0 rc2
 2016-10-27 15:33:15 -07:00
Joffrey F e563b58595 Merge pull request #4071 from NiR-/fix/run-as-container 
Fix path of the parent dir of COMPOSE_FILE
 2016-10-27 15:03:54 -07:00
Aanand Prasad 62c9ed93d0 Merge pull request #4084 from shin-/bump_docker_py 
Bump docker-py version to include latest patch
 2016-10-27 12:53:44 -07:00
Joffrey F a2da43b997 Bump 1.9.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:49:26 -07:00
Joffrey F 252d15a4a9 Add missing config schema to docker-compose.spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:23:49 -07:00
Joffrey F 77b5ac4e54 Improve robustness of a couple integration tests with occasional failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:23:49 -07:00
Joffrey F a406378a1f Do not print Swarm mode warning when connecting to a UCP server 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:23:49 -07:00
Joffrey F 29f9594ab9 Replace "which" calls with the portable find_executable function 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:23:49 -07:00
Joffrey F ca529d36f8 Fix schema divergence - add missing fields to compose 2.1 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:23:49 -07:00
Joffrey F 455fde15c6 Bump docker-py version to include latest patch 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:23:49 -07:00
Joffrey F 7d03c1fe29 Merge remote-tracking branch 'source/release' into bump-1.9.0-rc2 2016-10-27 12:15:32 -07:00
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 #4066 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 #4067 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 #4065 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 #4069 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 #4064 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 0ca4d9c274 Merge pull request #4048 from docker/bump-1.9.0rc1 
Bump 1.9.0-rc1
 2016-10-20 15:03:54 -07:00
Joffrey F 28788bd9b5 Bump 1.9.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-20 12:05:20 -07:00
Joffrey F c36bb3f8d2 Merge remote-tracking branch 'source/release' into bump-1.9.0rc1 2016-10-19 13:29:53 -07:00
Joffrey F 3147090fb4 Merge pull request #4030 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 #3980 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 #3972 from shin-/fix-contributors-script 
Fix the contributors script
 2016-10-18 15:25:55 -07:00
Joffrey F 932b3cc10a Merge pull request #4026 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 #3990 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