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
ae26fdf916
Merge pull request #4157 from docker/bump-1.9.0
...
Bump 1.9.0
2016-11-16 11:20:18 -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
25853874c4
Bump 1.9.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-15 15:10:36 -08:00
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
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
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
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
70e90a07d3
Merge remote-tracking branch 'source/release' into bump-1.9.0
2016-11-15 15:01:58 -08: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
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
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
181a4e990e
Bump 1.9.0-rc4
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-08 15:22:19 -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
6d02f3fb23
Fix logging dict merging
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-07 15:49:14 -08:00
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
39d91cae95
Merge remote-tracking branch 'source/release' into bump-1.9.0-rc4
2016-11-07 15:48:07 -08: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
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
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
fcd38d3c4b
Bump 1.9.0-rc3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 13:49:03 -07:00
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
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
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
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
Joffrey F
Ian Campbell
Aanand Prasad
Thomas Grainger
Daniel Nephin
Jari Takkala
Mike Dougherty