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
fbcc1510cc
Handle giving help a nonexistent command
...
The CLI would show an unhandled exception when running:
$ docker-compose help foobar
Now, it lists the commands.
Signed-off-by: Danny Guo <dannyguo91@gmail.com>
2016-12-03 14:58:15 -05: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
466ebb6cc1
Merge pull request #4146 from dnephin/add-stop-grace-period
...
Add stop grace period to v3
2016-11-16 17:56:20 +00:00
079c95c340
Use stop grace period for container stop.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-16 12:12:28 -05:00
6cac48c056
Add a vendored and modified pytimeparse
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-16 12:10:32 -05:00
586443ba5d
Merge pull request #4147 from aanand/version-3.0
...
Support version 3.0 of the Compose file format
2016-11-16 16:34:50 +00:00
f75ef6862f
Warn if any services use 'deploy'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:07:02 +00:00
d717c88b6e
Support version 3.0 of the Compose file format
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:07:02 +00:00
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
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
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
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
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
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
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
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
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
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
0902edef43
Merge pull request #4113 from shin-/4103-merge-empty-logging
...
Fix logging dict merging
2016-11-08 14:56:27 +00:00
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
10417eebd7
Fix logging dict merging
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 17:22:31 -07:00
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
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
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
d525dd1846
Merge pull request #4104 from shin-/bump_docker_py
...
Bump docker-py
2016-11-03 11:43:04 -07:00
7a430dbe96
Updated docker-py dependency to latest version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-02 16:56:45 -07:00
3b46a62f36
Merge pull request #4073 from mikedougherty/jenkinsfile
...
Update Jenkinsfile to run "janky" tasks
2016-11-02 14:55:11 -07:00
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
ed71391f66
Merge pull request #4062 from strayobject/patch-1
...
fix(docs): updated documentation links
2016-10-28 11:55:58 -07:00
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
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
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
Joffrey F
Joffrey F
Aanand Prasad
Daniel Nephin
Yong Wen Chua
Danny Guo
Ian Campbell
Thomas Grainger
Jari Takkala
Mike Dougherty