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,606 Commits 23 Branches 268 Tags
Commit Graph

3606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
25853874c4 Bump 1.9.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.9.0 		2016-11-15 15:10:36 -08:00
Aanand Prasad
46f034705e Test that values in 'environment' override env files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-15 15:06:10 -08:00
Joffrey F
4d85caf143 Limit testing pool to Ubuntu hosts to avoid errors with dind not starting properly. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 15:06:10 -08:00
Joffrey F
efda1efffe Avoid breaking when remote driver options are null. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 15:06:10 -08:00
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
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
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
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
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
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
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
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
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
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>
1.9.0-rc1 		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
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 #3991 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 #3994 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 #4034 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 #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