45c7ee4466
Merge pull request #4279 from dnephin/fix-schema-typo
...
Fix schema typo
2017-01-05 17:15:39 -08:00
e063c5739f
Fix config schemas (misplaced "additionalProperties")
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-05 11:18:21 -08:00
534b4ed820
Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 15:45:11 -08:00
27d91bba01
Merge pull request #4293 from shin-/stop_timeout_v2.1
...
Add support for stop_grace_period in v2
2017-01-04 15:14:18 -08:00
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
1be41f59c9
Add support for stop_grace_period in v2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 14:30:20 -08:00
ecff6f1a9a
Bump 1.10.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 13:54:11 -08:00
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
838bdd71f3
Merge pull request #4291 from shin-/unify-healthcheck-def-v2v3
...
Unify healthcheck spec definition in v2 and v3
2017-01-04 13:53:39 -08:00
a45bb184f1
Merge remote-tracking branch 'source/release' into bump-1.10.0-rc1
2017-01-04 13:16:46 -08:00
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
8145429399
Unify healthcheck spec definition in v2 and v3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 13:14:23 -08:00
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
bef2308530
Fix condition name in config tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -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
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
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
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
2648af6807
enable universal wheels
...
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2017-01-04 18:33:58 +00:00
c73fc26824
Fix 404 issue, change APIError to more accureate ImageNotFound
...
Signed-off-by: Jun Guo <blackhumour.gj@gmail.com>
2017-01-04 15:42:31 +08:00
a74b2f2f70
Fix schema typo.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-28 15:16:53 -05:00
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
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
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
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
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
eb6441c8e3
Add sysctls option to 3.0 schema
...
Signed-off-by: Joffrey F <joffrey@docker.com>
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
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-19 20:33:54 -08:00
e6b2949edc
Merge pull request #4216 from lawliet89/userns_mode
...
Implement `userns_mode` HostConfig for services
2016-12-19 18:12:15 -08:00
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
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
fb165d9c15
Add v3_only marker to healthcheck test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-16 12:21:59 -08:00
9cb6a70b6f
Merge pull request #4219 from shin-/dockerpy_2.0
...
Use docker SDK 2.0
2016-12-14 16:19:34 -08:00
04e5925a23
Use docker SDK 2.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-14 15:36:08 -08:00
635a281777
Merge pull request #4163 from aanand/add-healthcheck
...
Implement 'healthcheck' option
2016-12-14 15:35:05 -08:00
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
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
e04a12b5ca
Increase minimum version for v3.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-07 11:16:40 -05:00
b453ee46e8
Merge pull request #4228 from shin-/bump_version
...
Bump master version to 1.10.0dev
2016-12-06 17:50:44 -08:00
4d0575355c
Bump master version to 1.10.0dev
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-06 17:14:05 -08:00
62f8b1402e
Implement `userns_mode` HostConfig for services
...
Fixes #3349
This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2016-12-05 14:25:56 +08:00
6aacf51427
Win32 interactive run - Connect container to networks before starting
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-02 16:10:15 -08:00
9bfb855b89
Merge pull request #4187 from ijc25/pull-urxvt-corruption
...
progress_stream: Avoid undefined ANSI escape codes
2016-12-02 13:54:08 -08:00
dc9184a90f
progress_stream: Avoid undefined ANSI escape codes
...
The ANSI escape codes \e[0A (cursor up 0 lines) and \e[0B (cursor down 0 lines)
are not well defined and are treated differently by different terminals. In
particular xterm treats 0 as a missing parameter and therefore defaults to 1,
whereas rxvt-unicode treats these escapes as a request to move 0 lines.
However the use of these codes is unnecessary and were really just hiding the
fact that we were not correctly computing diff when adding a new line. Having
added the new line to the ids map and output the corresponding \n the correct
diff would be 1 and not 0 (which xterm interprets as 1) as currently.
Rather than changing the hardcoded 0 to a 1 pull the diff calculation out and
always do it since it produces the correct answer in both cases.
This fixes similar corruption when compose is pulling an image to that seen
with `docker pull` and rxvt-unicode (and likely other terminals in that family)
seen in docker/docker#28111 .
This is the same as the fix made to Docker's pkg/jsonmessage in
https://github.com/docker/docker/pull/28238 (and I have shamelessly ripped off
most of this commit message from there).
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-25 10:16:37 +00:00
def150a129
Merge pull request #4173 from graingert/case-pypi-correctly
...
case PyPI correctly
2016-11-22 18:15:10 -08:00
af894b4dff
Merge pull request #4170 from dnephin/warn-on-deploy
...
Update messages about docker stack deploy
2016-11-22 17:07:13 +00:00
024b5dd6da
case PyPI correctly
...
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2016-11-22 11:15:21 +00:00
c26a2afaf3
Update messages about docker stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-21 16:34:49 -05:00
716a6baa59
Implement 'healthcheck' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-18 14:47:02 +00:00
f5ad3e7577
Merge pull request #4165 from shin-/changelog_update
...
Changelog update
2016-11-17 13:29:32 -08:00
b93211881b
Changelog update
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-16 13:35:29 -08:00
Joffrey F
Joffrey F
Thomas Grainger
Jun Guo
Daniel Nephin
Aanand Prasad
Yong Wen Chua
Ian Campbell