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

3095 Commits

Author SHA1 Message Date
Aanand Prasad 716a6baa59 Implement 'healthcheck' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-18 14:47:02 +00:00
Aanand Prasad 466ebb6cc1 Merge pull request #4146 from dnephin/add-stop-grace-period 
Add stop grace period to v3
 2016-11-16 17:56:20 +00:00
Daniel Nephin 079c95c340 Use stop grace period for container stop. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-16 12:12:28 -05:00
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 586443ba5d Merge pull request #4147 from aanand/version-3.0 
Support version 3.0 of the Compose file format
 2016-11-16 16:34:50 +00:00
Aanand Prasad f75ef6862f Warn if any services use 'deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-16 16:07:02 +00: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 09540339e0 Merge pull request #4131 from aanand/test-environment-overrides-env-file 
Test that values in 'environment' override env files
 2016-11-15 14:18:54 -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
Joffrey F 3d0747017a Merge pull request #4151 from shin-/fix_ignore_pull_failure_behavior_1.13 
Handle new pull failures behavior in Engine 1.13
 2016-11-15 12:00:19 -08:00
Joffrey F efb4ed1b9e Handle new pull failures behavior in Engine 1.13 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 11:30:52 -08:00
Joffrey F d7e9748501 Merge pull request #4150 from shin-/test_only_ubuntu_host 
Limit testing pool to Ubuntu hosts to avoid errors with dind
 2016-11-14 18:04:30 -08:00
Joffrey F 0291d9ade5 Limit testing pool to Ubuntu hosts to avoid errors with dind not 
starting properly.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-14 17:23:25 -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 0e28163ccb Merge pull request #4115 from shin-/fix_overlay_options_mismatch 
Call check_remote_network_config from Network.ensure
 2016-11-08 15:35:38 -08:00
Aanand Prasad 0902edef43 Merge pull request #4113 from shin-/4103-merge-empty-logging 
Fix logging dict merging
 2016-11-08 14:56:27 +00:00
Joffrey F 4aa7d15d97 Call check_remote_network_config from Network.ensure 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-04 10:51:14 -07: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 9046e33ab2 Merge pull request #4112 from mikedougherty/rm-docs-checker 
Remove docs checker from Jenkinsfile and use cleanWorkspace option on wrappedNode
 2016-11-03 17:22:05 -07:00
Mike Dougherty da1508051d Remove docs checker from Jenkinsfile and use cleanWorkspace option on wrappedNode 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-11-03 14:00:17 -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 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 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 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 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