Commit Graph
36672 Commits
Author SHA1 Message Date
Ian Campbell fd24308e6e pkg/jsonmessage: Wrap test failure messages so control characters align
When logging the failure of a case which involves control characters add line
feeds and spacing such that the expected and actual strings are aligned in the
same columns making comparisons easier.

Turns:
	jsonmessage_test.go:156: Expected "\x1b[2K\rstatus      1 B\r", got "\x1b[1K\x1b[K\rstatus      1 B\r"
Into:
	jsonmessage_test.go:156:
		Expected "\x1b[2K\rstatus      1 B\r"
		     got "\x1b[1K\x1b[K\rstatus      1 B\r"

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: 2e3baa98eb0f40898005db1b40303848bf5c7de2
Component: engine
2016-11-11 11:40:11 +00:00
Ian Campbell 43e871dd1e pkg/jsonmessage: Format all test expected/actual strings with %q
The majority already did so, but a few used %v.

Compared with %v using %q escapes any control characters ensuring they are
visible in the logs (otherwise they can cause scrolling and overwriting etc).

The %q formatter also includes the surrounding "s making the manual use of []
to wrap/delimit the %v output unnecessary.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: 6582cfb1d4fec92b17e10291d30c2e6312ceb5f5
Component: engine
2016-11-11 11:39:05 +00:00
Victor Vieux 79dfcbcb8d bump version to 1.14.0-dev
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 869242662b38244469d5192bb0980f42b3de2901
Component: engine
2016-11-11 02:28:13 -08:00
Vincent Demeester ea25b45846 Add support for tty in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 356421b7da
Component: cli
2016-11-11 11:27:21 +01:00
Vincent Demeester 66e58fd23d Add support for tty in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: de15de6b4d90f8d707d92ab2f8b6a63e0742e8ce
Component: engine
2016-11-11 11:27:21 +01:00
Vincent Demeester 1eaec61ab6 Update compose-file to 8cff34df885ef07824138236bc4d27d359888b17
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f3dcae7dd36daf85de49af9f86145a9c5f5bd15a
Component: engine
2016-11-11 11:25:57 +01:00
Victor Vieux fac5d757e4 add 1.13.0 CHANGELOG.md
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 433bb525214db1359df18be280f555d915f7e386
Component: engine
2016-11-11 02:08:55 -08:00
lixiaobing10051267 cef0e077e9 fix the wrong title with docker swarm
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: f469021f88ef4765f9871c36b61e4f0138528a7b
Component: engine
2016-11-11 17:44:00 +08:00
Akihiro Suda 8f382a418c Update docs/deprecated.md for 1.13
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 6694974c9e3532cdaf5333b0a8b19f5ca64c70f0
Component: engine
2016-11-11 09:26:01 +00:00
Noah Treuhaft 8590d5f754 Disable v1 protocol for the default registry
All images in the default registry (AKA docker.io, index.docker.io, and
registry-1.docker.io) are available via the v2 protocol, so there's no
reason to use the v1 protocol.  Disabling it prevents useless fallbacks.

Signed-off-by: Noah Treuhaft <noah.treuhaft@docker.com>
Upstream-commit: 7ffb4ad81ab8e4400b0a588552ffb99dc55d13aa
Component: engine
2016-11-11 00:23:25 -08:00
Victor Vieux 87324db99d fix ARM unsafe access
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 84264e9461e11ee2884830df0768eaea662c5cc9
Component: engine
2016-11-10 23:55:38 -08:00
Victor Vieux b7b4e2f3f9 Merge pull request #28128 from leth/commit_image_id
Add Image ID to container commit event
Upstream-commit: 90d10203a40d9f2e4247693d2154bdf0bdb6a07c
Component: engine
2016-11-10 23:14:46 -08:00
Evan Hazlett d0e36ad78e Merge pull request #28266 from tonistiigi/fix-service-update-test
Fix flaky TestServiceUpdateSecrets
Upstream-commit: 45585ab7a5097bd0b9b2db1c8a50927a62201b75
Component: engine
2016-11-11 01:17:29 -05:00
Victor Vieux 28edc30e67 Merge pull request #28278 from yuexiao-wang/stack-deploy
Add --with-registry-auth for stack deploy
Upstream-commit: e68003142f641729d62264dce2a1e1b2c63916d7
Component: engine
2016-11-10 21:28:40 -08:00
Victor Vieux 8dad3fef6f Merge pull request #27955 from mlaventure/runc-docker-info
Add external binaries version to docker info
Upstream-commit: 19c8941f2f
Component: cli
2016-11-10 21:27:14 -08:00
Victor Vieux 4d7a48f6ec Merge pull request #27955 from mlaventure/runc-docker-info
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
2016-11-10 21:27:14 -08:00
Tõnis Tiigi bfae681497 Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
Fix registry authorization errors
Upstream-commit: 795e487513
Component: cli
2016-11-10 19:39:28 -08:00
Tõnis Tiigi e297f40024 Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
Fix registry authorization errors
Upstream-commit: 48a0c3e831a13c48a2e64558ff38a79b22881f85
Component: engine
2016-11-10 19:39:28 -08:00
Tõnis Tiigi 840ea93170 Merge pull request #27917 from mrjana/ports
Add support for host port PublishMode in services
Upstream-commit: a5da9f5cc911da603a41bb77ca1ccbb0848d6260
Component: engine
2016-11-10 19:38:54 -08:00
Tõnis Tiigi 128844d475 Merge pull request #28265 from aaronlehmann/dont-repull-digest
executor: Don't repull image if pinned by digest
Upstream-commit: 1229105582ff8a05493637e709e46edf2061c0c1
Component: engine
2016-11-10 19:19:31 -08:00
yuexiao-wang 8256e8f1b5 Add --with-registry-auth for stack deploy
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 8e04bc5572dc5790868d8c40c62c17ccae043031
Component: engine
2016-11-11 11:01:31 +08:00
Victor Vieux 14e665f942 Merge pull request #28277 from datawolf/small-fix
Use '.' directly
Upstream-commit: 82130b725dd2a13839aa45b0d99870bd8bda0f47
Component: engine
2016-11-10 19:00:21 -08:00
Victor Vieux 75859b8297 Merge pull request #28217 from Microsoft/jjh/373engineapifollowup
Tidy GetDockerOS() function
Upstream-commit: dc4d7a83ff
Component: cli
2016-11-10 18:57:56 -08:00
Victor Vieux 36fa7495ed Merge pull request #28217 from Microsoft/jjh/373engineapifollowup
Tidy GetDockerOS() function
Upstream-commit: 4453fd22a7ff3f51383c814a4cbd119bccbe7a92
Component: engine
2016-11-10 18:57:56 -08:00
Wang Long cc37942a6e Use '.' directly
Signed-off-by: Wang Long <long.wanglong@huawei.com>
Upstream-commit: 076bfc0647
Component: cli
2016-11-11 10:22:32 +08:00
Wang Long ae5c2620b1 Use '.' directly
Signed-off-by: Wang Long <long.wanglong@huawei.com>
Upstream-commit: 2b7f7e9aff9e402daa2c561b561178f46769d1c8
Component: engine
2016-11-11 10:22:32 +08:00
Brian Goff 3a5144de44 Merge pull request #28276 from lixiaobing10051267/masterSwarmRouter
rectify type defination for swarmRouter
Upstream-commit: bd78374618dd4282445cd3b7230a22ba0b2b237d
Component: engine
2016-11-10 21:16:31 -05:00
lixiaobing10051267 1a60835f0f rectify type defination for swarmRouter
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: ac5d86a672c9b46f2c26540690fcbd92c25715dc
Component: engine
2016-11-11 10:45:48 +08:00
Jana Radhakrishnan 69a2e4be9f Add support for host port PublishMode in services
Add api/cli support for adding host port PublishMode in services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 148dc157f6
Component: cli
2016-11-10 18:07:55 -08:00
Jana Radhakrishnan b688822593 Add support for host port PublishMode in services
Add api/cli support for adding host port PublishMode in services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 14ac9f60d0174256e0713701ebffaf5ca827da71
Component: engine
2016-11-10 18:07:55 -08:00
Victor Vieux ca36766d89 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
2016-11-10 17:59:57 -08:00
Victor Vieux 89896ee078 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
Upstream-commit: 7d89ba2d9d
Component: cli
2016-11-10 17:59:57 -08:00
Lei Jitang d159a5119b Merge pull request #28231 from yuexiao-wang/container-exec
Remove redundant parameter and fix typos
Upstream-commit: 891e03eb7dc3b3e5a22efa21f76a5ae1e35cc03b
Component: engine
2016-11-11 09:55:42 +08:00
Lei Jitang a99e0f963e Merge pull request #28231 from yuexiao-wang/container-exec
Remove redundant parameter and fix typos
Upstream-commit: 005a3037de
Component: cli
2016-11-11 09:55:42 +08:00
John Howard 29d6547bdb Windows: create daemon root with ACL
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 46ec4c1ae2700ed638072fd7fb326afc10eded20
Component: engine
2016-11-10 17:51:28 -08:00
Derek McGowan bfaa4fa163 Update for distribution vendor
Handle updates to reference package.
Updates for refactoring of challenge manager.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 43bcd982cd
Component: cli
2016-11-10 17:34:12 -08:00
Derek McGowan 3fc4b494de Update pull error handling
Translate pull errors to provide a more consistent and user friendly
error message.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 19a93a6e3d4213c56583bb0c843cf9e33d379752
Component: engine
2016-11-10 17:34:12 -08:00
Derek McGowan 874be028c3 Update for distribution vendor
Handle updates to reference package.
Updates for refactoring of challenge manager.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: c85eb008416f352327b67dce351101591cd5f781
Component: engine
2016-11-10 17:34:12 -08:00
Derek McGowan 5c38fc2991 Update distribution vendor
Pull in client changes to handle oauth errors

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 60ecc132c538129e7093dd38987291651e418035
Component: engine
2016-11-10 17:34:12 -08:00
Victor Vieux 3baa399d95 Merge pull request #28226 from vieux/exit_exp_plugin
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
2016-11-10 17:30:54 -08:00
Victor Vieux 706abe7be6 Merge pull request #28226 from vieux/exit_exp_plugin
move plugins out of experimental
Upstream-commit: 63167f17b0
Component: cli
2016-11-10 17:30:54 -08:00
Tõnis Tiigi d19c3e6850 Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
Fix failure to get containers when deleting a layer
Upstream-commit: d54f4472fdfad1a9c9b04ed2b50ac010556ab44e
Component: engine
2016-11-10 17:10:05 -08:00
Tõnis Tiigi 7e73078707 Merge pull request #28238 from ijc25/jsonmessage-urxvt-corruption
pkg/jsonmessage: Avoid undefined ANSI escape codes.
Upstream-commit: 7aeacd35f285ea9376c9949f7688a93f9d601f29
Component: engine
2016-11-10 17:07:01 -08:00
Victor Vieux f380f55b88 Merge pull request #28031 from yongtang/27902-extra-hosts
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: 32beb80f99
Component: cli
2016-11-10 16:55:29 -08:00
Victor Vieux 3213314d62 Merge pull request #28031 from yongtang/27902-extra-hosts
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: bed96ce922da5fa9df98b826ff0e4ad4bf375a31
Component: engine
2016-11-10 16:55:29 -08:00
Victor Vieux 2be2974635 Merge pull request #28271 from andrewhsu/fix-opensuse
replace vim-common with vim for opensuse
Upstream-commit: 813f86697f5190defa7fbc170ec5efbcc6ad3942
Component: engine
2016-11-10 16:52:30 -08:00
John Howard ce9a44097a Merge pull request #28268 from Microsoft/jjh/clientcheck
Windows: Additional client check
Upstream-commit: 29b7a737925d05f3fb46db97ae64661c6e9f3a31
Component: engine
2016-11-10 16:11:44 -08:00
Victor Vieux a867bf217d move plugins out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 1f6f5bec49
Component: cli
2016-11-10 15:51:32 -08:00
Victor Vieux b0b2a12b08 update media_type
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 970b23db2e97e1671c6bf4b57bfe5d1a30e98819
Component: engine
2016-11-10 15:51:32 -08:00
Victor Vieux 66e137540f move plugins out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: f5cea67e33
Component: cli
2016-11-10 15:51:32 -08:00