1b38432db0
only check secrets for service create if requested
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 8dfdecbd2bf1c13e664a03b0c7c61ff391fb4fe1
Component: engine
2016-11-11 10:07:24 -05:00
b02f8973b1
Merge pull request #28298 from vdemeester/compose-swarm-tty
...
Add support for tty in compose to swarm
Upstream-commit: 0bb6bac793af1cbdad7793fda7817323e435bf6c
Component: engine
2016-11-11 09:06:09 -05:00
ade3f0003f
Merge pull request #28293 from AkihiroSuda/update-deprecate-md
...
[doc] Update docs/deprecated.md for 1.13
Upstream-commit: 58c040607600699db7bdf5c13ac5ba8a7f44fa7d
Component: engine
2016-11-11 13:48:14 +01:00
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
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
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
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
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
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
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
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
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
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
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
14e665f942
Merge pull request #28277 from datawolf/small-fix
...
Use '.' directly
Upstream-commit: 82130b725dd2a13839aa45b0d99870bd8bda0f47
Component: engine
2016-11-10 19:00:21 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
fadae43674
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
2016-11-10 15:51:32 -08:00
87b507f694
Merge pull request #28228 from tonistiigi/swarm-cert-expired
...
Start daemon if certificates have been expired
Upstream-commit: 1e592349f192d020b14372f4d3c21cd3a7c8bd9a
Component: engine
2016-11-10 15:50:36 -08:00
2c1cd5595f
replace vim-common with vim for opensuse
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 5764171fe773b450c05b39c43a5a69d55cd0ce79
Component: engine
2016-11-10 15:50:29 -08:00
4cf2d87976
Merge pull request #28221 from aboch/ala
...
Add local address autodetection on swarm init
Upstream-commit: 5d1feb561f1f8b402b5c77b2f27f3d571bd2b226
Component: engine
2016-11-10 15:45:59 -08:00
f4dd1c6a23
Merge pull request #28264 from dmcgowan/fix-overlay2-naivediff-unittest
...
Skip overlay2 diff tests when using naivediff
Upstream-commit: f3f9b3dac9114cfe0f8bf0380dd7343cc58d3a1c
Component: engine
2016-11-11 00:24:06 +01:00
0d1faa11e0
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
Upstream-commit: 5f9fe54b35cf64181c62a8faec8651c6a25fcc95
Component: engine
2016-11-10 15:13:41 -08:00
147fe85462
executor: Don't repull image if pinned by digest
...
If the image reference in the spec uses a digest, and an image with that
digest already exists locally, avoid an unnecessary repull.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f69e5c18ac1186af96a75918fc60f0b8e5ae7675
Component: engine
2016-11-10 14:45:54 -08:00
8dbcc088be
Windows: Additional client check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b4ad8d6f51f43711846945e2dd8ad40d7020b53
Component: engine
2016-11-10 14:35:19 -08:00
a99fd733ad
Merge pull request #28261 from Microsoft/jjh/dockerfile
...
Windows: Dockerfile Win 10 client note
Upstream-commit: f87e6eb8305627e984f3d72c43837a833cc6de42
Component: engine
2016-11-10 23:28:03 +01:00
b55a4aaec7
Start daemon if certificates have been expired
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 439de7694d67eede9867aae12f304772962bffcd
Component: engine
2016-11-10 14:11:53 -08:00
9a8c3a6932
Fix failure to get containers when deleting a layer
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d4095a5902b62181d49ef07db18610975cb49d08
Component: engine
2016-11-10 14:07:11 -08:00
5c8a6f6329
Vendor update hcsshim to v0.5.8
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d0e1949d2280533a57170c9e457ee700fb924ab9
Component: engine
2016-11-10 14:06:57 -08:00
b8314489b1
Merge pull request #28257 from sanimej/iptables
...
vendor libnetwork @1861587
Upstream-commit: f700a86dc01ef65061a695cc8e0694afaff8b334
Component: engine
2016-11-10 14:01:02 -08:00
510a237f2b
Merge pull request #28253 from aaronlehmann/arg-descriptions
...
cli: Change autolock flag description
Upstream-commit: 0151fb7618ee7cd0bb7de213c604257cf5e3dc92
Component: engine
2016-11-10 13:59:46 -08:00
c4c2fd866c
Fix flaky TestServiceUpdateSecrets
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fc21fcc90e5e1270aeb60f8f871adfd18e618c21
Component: engine
2016-11-10 13:59:28 -08:00
c051f7673e
Merge pull request #28222 from thaJeztah/add-fedora-25
...
Add Fedora 25 RPMs
Upstream-commit: f1f3c4cc87ad10963cad36dffa3c39b65325f301
Component: engine
2016-11-10 13:57:41 -08:00
17c10a9402
Skip overlay2 diff tests when using naivediff
...
Naivediff fails when layers are created directly on top of
each other. Other graphdrivers which use naivediff already
skip these tests. Until naivediff is fixed, skip with overlay2
when running tests on a kernel which causes naivediff fallback.
Fix applydiff to never use the naivediff size when not applying
changes with naivediff.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 5a1b557281204964f37e81cb0776758360029555
Component: engine
2016-11-10 13:52:22 -08:00
1039b39798
Merge pull request #27116 from cpuguy83/22564_fix_volume_unmount
...
Fix uneccessary calls to `volume.Unmount()`
Upstream-commit: f3864bcd3406c963395f6de9cdc7172c0daa1f5d
Component: engine
2016-11-10 13:48:44 -08:00
