Commit graph

  • 263b9e9317 Merge pull request #4360 from shin-/4359-volume-labels Joffrey F 2017-01-19 17:40:29 -08:00
  • d83d31889e Remove external_name from volume def in config output Joffrey F 2017-01-19 16:05:13 -08:00
  • 5c2165eaaf Fix volume definition in v3 schema Joffrey F 2017-01-19 15:41:31 -08:00
  • 8a27a0f059 Merge pull request #4350 from shin-/fix-invalid-depends-on-merge Joffrey F 2017-01-19 14:50:29 -08:00
  • b47c97e94e Merge pull request #4358 from shin-/1.11-dev Joffrey F 2017-01-19 14:50:10 -08:00
  • a482c138d8 Merge pull request #4353 from xulike666/fight-for-readability Joffrey F 2017-01-19 14:49:05 -08:00
  • 1c46525c2b 1.11.0dev Joffrey F 2017-01-19 14:47:31 -08:00
  • 169289c8b6 find a fishbone Aaron.L.Xu 2017-01-20 00:52:13 +08:00
  • 1a02121ab5 depends_on merge now retains condition information when present Joffrey F 2017-01-18 17:52:03 -08:00
  • adcd1901e9 Merge pull request #4340 from docker/bump-1.10.0 Joffrey F 2017-01-17 15:25:06 -08:00
  • 708c4f9534 Merge pull request #4339 from shin-/4328-catch-healthcheck-exception Joffrey F 2017-01-17 14:16:37 -08:00
  • 4bd6f1a0d8 Bump 1.10.0 1.10.0 Joffrey F 2017-01-17 13:25:28 -08:00
  • 4302861b21 Catch healthcheck exceptions in parallel_execute Joffrey F 2017-01-17 13:22:16 -08:00
  • 76678747c7 Provide valid serialization of depends_on when format is not 2.1 Joffrey F 2017-01-11 16:25:40 -08:00
  • ab97716a95 Use correct wheel file name in twine upload command Joffrey F 2017-01-11 15:39:48 -08:00
  • 260995fd56 Merge remote-tracking branch 'source/release' into bump-1.10.0 Joffrey F 2017-01-17 13:24:01 -08:00
  • 56a1b02aac Catch healthcheck exceptions in parallel_execute Joffrey F 2017-01-17 13:22:16 -08:00
  • 931027c598 add IMAGE_EVENTS: load/save muicoder 2017-01-16 10:43:29 +08:00
  • 5ade097d74 Merge pull request #4324 from shin-/4321-v3-depends-on Joffrey F 2017-01-12 11:52:15 -08:00
  • 62cdd25b7d Merge pull request #4323 from shin-/fix-push-release-script Joffrey F 2017-01-12 11:52:05 -08:00
  • 2df31bb13c Provide valid serialization of depends_on when format is not 2.1 Joffrey F 2017-01-11 16:25:40 -08:00
  • 29b46d5b26 Use correct wheel file name in twine upload command Joffrey F 2017-01-11 15:39:48 -08:00
  • 0f8a1aa7a3 Merge pull request #4312 from docker/bump-1.10.0-rc2 Joffrey F 2017-01-11 11:36:56 -08:00
  • 2091149fee Merge pull request #4317 from shin-/release-script-fixes Joffrey F 2017-01-10 17:21:27 -08:00
  • fb241d0906 Bump 1.10.0-rc2 1.10.0-rc2 Joffrey F 2017-01-09 16:39:37 -08:00
  • 71dd874600 Fix docker image build script when using universal wheels Joffrey F 2017-01-10 16:43:26 -08:00
  • 19190ea0df Fix docker image build script when using universal wheels Joffrey F 2017-01-10 16:43:26 -08:00
  • 1c1fe89e43 Merge pull request #4316 from shin-/update-setup-py Joffrey F 2017-01-10 15:50:11 -08:00
  • 740a6842e8 Update setup.py extra_requires Joffrey F 2017-01-10 14:57:32 -08:00
  • 340a3fc09c enable universal wheels Thomas Grainger 2016-11-22 11:09:56 +00:00
  • 52792b7a96 Update setup.py extra_requires Joffrey F 2017-01-10 14:57:32 -08:00
  • 9f6778aa73 Merge pull request #4172 from graingert/enable-universal-wheels Joffrey F 2017-01-10 14:57:22 -08:00
  • cbb730172f Fix 404 issue, change APIError to more accureate ImageNotFound Jun Guo 2017-01-04 15:31:12 +08:00
  • 545153f117 Merge pull request #4288 from tntC4stl3/fix_404_issue Joffrey F 2017-01-09 16:43:57 -08:00
  • 91851cd5ae Fix schema typo. Daniel Nephin 2016-12-28 15:16:53 -05:00
  • 22b837975d Add support for stop_grace_period in v2 Joffrey F 2017-01-04 14:30:20 -08:00
  • de38c023ce Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized Joffrey F 2017-01-04 15:26:11 -08:00
  • 344f015a22 Use docker SDK 2.0.1 Joffrey F 2017-01-06 17:45:57 -08:00
  • 5dabe4ae62 Merge remote-tracking branch 'source/release' into bump-1.10.0-rc2 Joffrey F 2017-01-09 16:27:38 -08:00
  • 3f7b3fbf0a Merge pull request #4304 from shin-/4302-dockerignore-windows Joffrey F 2017-01-09 16:14:57 -08:00
  • 88294b46dd Merge pull request #4294 from shin-/4240-compose-convert-false Joffrey F 2017-01-09 15:49:44 -08:00
  • 2c157e8fa9 Use docker SDK 2.0.1 Joffrey F 2017-01-06 17:45:57 -08:00
  • b570cba965 Merge pull request #3961 from ankon/patch-1 Joffrey F 2017-01-09 12:15:04 -08:00
  • 3bb8a7d178 Merge pull request #4297 from shin-/4271-fix-schemas Joffrey F 2017-01-06 12:10:22 -08:00
  • 45c7ee4466 Merge pull request #4279 from dnephin/fix-schema-typo Joffrey F 2017-01-05 17:15:39 -08:00
  • e063c5739f Fix config schemas (misplaced "additionalProperties") Joffrey F 2017-01-05 11:15:24 -08:00
  • 534b4ed820 Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized Joffrey F 2017-01-04 15:26:11 -08:00
  • 27d91bba01 Merge pull request #4293 from shin-/stop_timeout_v2.1 Joffrey F 2017-01-04 15:14:18 -08:00
  • 3dc5f91942 Merge pull request #4292 from docker/bump-1.10.0-rc1 Joffrey F 2017-01-04 14:53:19 -08:00
  • 1be41f59c9 Add support for stop_grace_period in v2 Joffrey F 2017-01-04 14:30:20 -08:00
  • ecff6f1a9a Bump 1.10.0-rc1 1.10.0-rc1 Joffrey F 2017-01-04 13:47:13 -08:00
  • f90618fc43 Unify healthcheck spec definition in v2 and v3 Joffrey F 2017-01-04 13:14:23 -08:00
  • 838bdd71f3 Merge pull request #4291 from shin-/unify-healthcheck-def-v2v3 Joffrey F 2017-01-04 13:53:39 -08:00
  • a45bb184f1 Merge remote-tracking branch 'source/release' into bump-1.10.0-rc1 Joffrey F 2017-01-04 13:16:46 -08:00
  • 47b672e393 Merge pull request #4051 from shin-/update-release-process Joffrey F 2017-01-04 13:15:49 -08:00
  • 8145429399 Unify healthcheck spec definition in v2 and v3 Joffrey F 2017-01-04 13:14:23 -08:00
  • be88bb0e6c Merge pull request #4267 from shin-/3754-depends-on-healthcheck Joffrey F 2017-01-04 13:00:19 -08:00
  • bef2308530 Fix condition name in config tests Joffrey F 2016-12-19 20:39:16 -08:00
  • 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 Joffrey F 2016-12-19 20:20:03 -08:00
  • f6edd610f3 Add 3.0 schema to docker-compose.spec Joffrey F 2016-12-14 15:39:42 -08:00
  • 0edfe08bf0 Add healthchecks to 2.1 schema. Update depends_on Joffrey F 2016-12-13 16:54:41 -08:00
  • 2648af6807
    enable universal wheels Thomas Grainger 2016-11-22 11:09:56 +00:00
  • c73fc26824 Fix 404 issue, change APIError to more accureate ImageNotFound Jun Guo 2017-01-04 15:31:12 +08:00
  • a74b2f2f70 Fix schema typo. Daniel Nephin 2016-12-28 15:16:53 -05:00
  • 09690e1758 Merge pull request #4220 from shin-/4211-default_network_labels Joffrey F 2016-12-20 02:34:57 -08:00
  • 3058e39407 Merge pull request #4268 from shin-/jtakkala-3765-sysctl-support Joffrey F 2016-12-20 02:34:02 -08:00
  • e1ebb0df22 Merge pull request #4070 from shin-/use-colorama Joffrey F 2016-12-20 02:32:51 -08:00
  • ba47fb99ba Add default labels to networks and volumes created by Compose Joffrey F 2016-12-05 18:21:10 -08:00
  • 346802715d Use colorama to enable colored output on Windows Joffrey F 2016-10-24 16:27:47 -07:00
  • eb6441c8e3 Add sysctls option to 3.0 schema Joffrey F 2016-12-19 20:35:09 -08:00
  • 82230071d5 Merge branch '3765-sysctl-support' of https://github.com/jtakkala/compose into jtakkala-3765-sysctl-support Joffrey F 2016-12-19 20:33:54 -08:00
  • e6b2949edc Merge pull request #4216 from lawliet89/userns_mode Joffrey F 2016-12-19 18:12:15 -08:00
  • ea7b565009 Merge pull request #4232 from shin-/attachable_networks Joffrey F 2016-12-16 13:06:57 -08:00
  • e736151ee4 Make created networks attachable for file format >=2.1 Joffrey F 2016-12-05 16:11:21 -08:00
  • fb165d9c15 Add v3_only marker to healthcheck test Joffrey F 2016-12-16 12:21:59 -08:00
  • 9cb6a70b6f Merge pull request #4219 from shin-/dockerpy_2.0 Joffrey F 2016-12-14 16:19:34 -08:00
  • 04e5925a23 Use docker SDK 2.0 Joffrey F 2016-12-05 17:42:07 -08:00
  • 635a281777 Merge pull request #4163 from aanand/add-healthcheck Joffrey F 2016-12-14 15:35:05 -08:00
  • 599b29e405 Merge pull request #4213 from shin-/4212-interactive-connect Aanand Prasad 2016-12-08 13:41:33 +00:00
  • 30eac9f1ae Merge pull request #4226 from dnephin/update-api-version-for-v3 Aanand Prasad 2016-12-07 16:59:28 +00:00
  • e04a12b5ca Increase minimum version for v3. Daniel Nephin 2016-12-06 17:01:35 -05:00
  • b453ee46e8 Merge pull request #4228 from shin-/bump_version Joffrey F 2016-12-06 17:50:44 -08:00
  • 4d0575355c Bump master version to 1.10.0dev Joffrey F 2016-12-06 17:14:05 -08:00
  • 62f8b1402e Implement userns_mode HostConfig for services Yong Wen Chua 2016-12-05 14:25:56 +08:00
  • 6aacf51427 Win32 interactive run - Connect container to networks before starting Joffrey F 2016-12-02 16:10:15 -08:00
  • 9bfb855b89 Merge pull request #4187 from ijc25/pull-urxvt-corruption Joffrey F 2016-12-02 13:54:08 -08:00
  • dc9184a90f progress_stream: Avoid undefined ANSI escape codes Ian Campbell 2016-11-25 10:12:22 +00:00
  • def150a129 Merge pull request #4173 from graingert/case-pypi-correctly Joffrey F 2016-11-22 18:15:10 -08:00
  • af894b4dff Merge pull request #4170 from dnephin/warn-on-deploy Aanand Prasad 2016-11-22 17:07:13 +00:00
  • 024b5dd6da
    case PyPI correctly Thomas Grainger 2016-11-22 11:14:56 +00:00
  • c26a2afaf3 Update messages about docker stack deploy. Daniel Nephin 2016-11-21 16:34:49 -05:00
  • 716a6baa59 Implement 'healthcheck' option Aanand Prasad 2016-11-14 18:31:38 +00:00
  • f5ad3e7577 Merge pull request #4165 from shin-/changelog_update Joffrey F 2016-11-17 13:29:32 -08:00
  • b93211881b Changelog update Joffrey F 2016-11-16 13:35:29 -08:00
  • ae26fdf916 Merge pull request #4157 from docker/bump-1.9.0 Joffrey F 2016-11-16 11:20:18 -08:00
  • 466ebb6cc1 Merge pull request #4146 from dnephin/add-stop-grace-period Aanand Prasad 2016-11-16 17:56:20 +00:00
  • 079c95c340 Use stop grace period for container stop. Daniel Nephin 2016-11-10 17:47:05 -05:00
  • 6cac48c056 Add a vendored and modified pytimeparse Daniel Nephin 2016-11-10 17:38:19 -05:00
  • 586443ba5d Merge pull request #4147 from aanand/version-3.0 Aanand Prasad 2016-11-16 16:34:50 +00:00
  • f75ef6862f Warn if any services use 'deploy' Aanand Prasad 2016-11-10 17:30:46 +00:00