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

3712 Commits

Author SHA1 Message Date
Daniel Nephin ce2219ec37 Add missing network.internal to v3 schema. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-30 16:24:40 -08:00
Joffrey F e035931f2e Fix volume definition in v3 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:24:40 -08:00
Joffrey F 5b912082e1 depends_on merge now retains condition information when present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:24:40 -08:00
Joffrey F 4d94594d37 Merge remote-tracking branch 'source/release' into bump-1.10.1 2017-01-30 16:11:06 -08:00
Joffrey F adcd1901e9 Merge pull request #4340 from docker/bump-1.10.0 
Bump 1.10.0
 2017-01-17 15:25:06 -08:00
Joffrey F 4bd6f1a0d8 Bump 1.10.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 4302861b21 Catch healthcheck exceptions in parallel_execute 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 76678747c7 Provide valid serialization of depends_on when format is not 2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F ab97716a95 Use correct wheel file name in twine upload command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 260995fd56 Merge remote-tracking branch 'source/release' into bump-1.10.0 2017-01-17 13:24:01 -08:00
Joffrey F 0f8a1aa7a3 Merge pull request #4312 from docker/bump-1.10.0-rc2 
Bump 1.10.0 rc2
 2017-01-11 11:36:56 -08:00
Joffrey F fb241d0906 Bump 1.10.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:47:40 -08:00
Joffrey F 71dd874600 Fix docker image build script when using universal wheels 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:47:40 -08:00
Joffrey F 740a6842e8 Update setup.py extra_requires 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 15:01:13 -08:00
Thomas Grainger 340a3fc09c enable universal wheels 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2017-01-10 15:01:13 -08:00
Jun Guo cbb730172f Fix 404 issue, change APIError to more accureate ImageNotFound 
Signed-off-by: Jun Guo <blackhumour.gj@gmail.com>
 2017-01-09 16:44:32 -08:00
Daniel Nephin 91851cd5ae Fix schema typo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-09 16:38:42 -08:00
Joffrey F 22b837975d Add support for stop_grace_period in v2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:25 -08:00
Joffrey F de38c023ce Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:23 -08:00
Joffrey F 344f015a22 Use docker SDK 2.0.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:14 -08:00
Joffrey F 5dabe4ae62 Merge remote-tracking branch 'source/release' into bump-1.10.0-rc2 2017-01-09 16:27:38 -08:00
Joffrey F 3dc5f91942 Merge pull request #4292 from docker/bump-1.10.0-rc1 
Bump 1.10.0 rc1
 2017-01-04 14:53:19 -08:00
Joffrey F ecff6f1a9a Bump 1.10.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 13:54:11 -08:00
Joffrey F f90618fc43 Unify healthcheck spec definition in v2 and v3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 13:54:11 -08:00
Joffrey F a45bb184f1 Merge remote-tracking branch 'source/release' into bump-1.10.0-rc1 2017-01-04 13:16:46 -08:00
Joffrey F 47b672e393 Merge pull request #4051 from shin-/update-release-process 
Update release process document to account for recent changes.
 2017-01-04 13:15:49 -08:00
Joffrey F be88bb0e6c Merge pull request #4267 from shin-/3754-depends-on-healthcheck 
Allow service dependencies to wait on healthy containers
 2017-01-04 13:00:19 -08:00
Joffrey F bef2308530 Fix condition name in config tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:28:30 -08:00
Joffrey F 04394b1d0a Expand depends_on to allow different conditions (service_start, service_healthy) 
Rework "up" and "start" to wait on conditional state of dependent services
Add integration tests

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:28:30 -08:00
Joffrey F f6edd610f3 Add 3.0 schema to docker-compose.spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:26:45 -08:00
Joffrey F 0edfe08bf0 Add healthchecks to 2.1 schema. Update depends_on 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:26:45 -08:00
Joffrey F 09690e1758 Merge pull request #4220 from shin-/4211-default_network_labels 
Add default labels to networks and volumes created by Compose
 2016-12-20 02:34:57 -08:00
Joffrey F 3058e39407 Merge pull request #4268 from shin-/jtakkala-3765-sysctl-support 
Add sysctl option support when creating service
 2016-12-20 02:34:02 -08:00
Joffrey F e1ebb0df22 Merge pull request #4070 from shin-/use-colorama 
Use colorama to enable colored output on Windows
 2016-12-20 02:32:51 -08:00
Joffrey F ba47fb99ba Add default labels to networks and volumes created by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:43:35 -08:00
Joffrey F 346802715d Use colorama to enable colored output on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:40:47 -08:00
Joffrey F eb6441c8e3 Add sysctls option to 3.0 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:35:09 -08:00
Joffrey F 82230071d5 Merge branch '3765-sysctl-support' of https://github.com/jtakkala/compose into jtakkala-3765-sysctl-support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:33:54 -08:00
Joffrey F e6b2949edc Merge pull request #4216 from lawliet89/userns_mode 
Implement `userns_mode` HostConfig for services
 2016-12-19 18:12:15 -08:00
Joffrey F ea7b565009 Merge pull request #4232 from shin-/attachable_networks 
Make created networks attachable for file format >=2.1
 2016-12-16 13:06:57 -08:00
Joffrey F e736151ee4 Make created networks attachable for file format >=2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-16 12:23:24 -08:00
Joffrey F fb165d9c15 Add v3_only marker to healthcheck test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-16 12:21:59 -08:00
Joffrey F 9cb6a70b6f Merge pull request #4219 from shin-/dockerpy_2.0 
Use docker SDK 2.0
 2016-12-14 16:19:34 -08:00
Joffrey F 04e5925a23 Use docker SDK 2.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-14 15:36:08 -08:00
Joffrey F 635a281777 Merge pull request #4163 from aanand/add-healthcheck 
Implement 'healthcheck' option
 2016-12-14 15:35:05 -08:00
Aanand Prasad 599b29e405 Merge pull request #4213 from shin-/4212-interactive-connect 
Win32 interactive run - Connect container to networks before starting
 2016-12-08 13:41:33 +00:00
Aanand Prasad 30eac9f1ae Merge pull request #4226 from dnephin/update-api-version-for-v3 
Increase minimum version for compose format v3
 2016-12-07 16:59:28 +00:00
Daniel Nephin e04a12b5ca Increase minimum version for v3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-07 11:16:40 -05:00
Joffrey F b453ee46e8 Merge pull request #4228 from shin-/bump_version 
Bump master version to 1.10.0dev
 2016-12-06 17:50:44 -08:00
Joffrey F 4d0575355c Bump master version to 1.10.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-06 17:14:05 -08:00