tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,690 Commits 23 Branches 268 Tags
Commit Graph

3690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
7e40754ffc Handle new pull failures behavior in Engine 1.13 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 15:06:10 -08:00
Joffrey F
70e90a07d3 Merge remote-tracking branch 'source/release' into bump-1.9.0 2016-11-15 15:01:58 -08: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
Jari Takkala
91620ae97b Add sysctl option support when creating service 
Closes #3765

Signed-off-by: Jari Takkala <jtakkala@gmail.com>
 2016-11-10 16:41:16 -05: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
b426868eda Merge pull request #4130 from docker/bump-1.9.0-rc4 
Bump 1.9.0 rc4
 2016-11-08 16:29:48 -08: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
Joffrey F
181a4e990e Bump 1.9.0-rc4 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.9.0-rc4 		2016-11-08 15:22:19 -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
6d02f3fb23 Fix logging dict merging 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-07 15:49:14 -08:00
Joffrey F
f4c037d223 Call check_remote_network_config from Network.ensure 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-07 15:49:00 -08:00
Joffrey F
39d91cae95 Merge remote-tracking branch 'source/release' into bump-1.9.0-rc4 2016-11-07 15:48:07 -08: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
Joffrey F
f4125b3444 Merge pull request #4105 from docker/bump-1.9.0-rc3 
Bump 1.9.0 rc3
 2016-11-03 14:42:59 -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
fcd38d3c4b Bump 1.9.0-rc3 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.9.0-rc3 		2016-11-03 13:49:03 -07:00
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>
1.9.0-rc2 		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