Antonio Murdaca
28fb705b0f
Merge pull request #28307 from albers/completion-dockerd--seccomp-profile
...
Add bash completion for `docker daemon --seccomp-profile`
Upstream-commit: 0dfeeac206da2738fe36dcedabdefa0c5c042636
Component: engine
2016-11-11 17:42:11 +01:00
Tõnis Tiigi
4a96d47119
Merge pull request #28285 from vieux/try_arm_fix_libnetwor
...
update libnetwork to fix ARM tests
Upstream-commit: d06b1e2cc2fbeec4316885d0f403c96dd34b89d7
Component: engine
2016-11-11 08:32:29 -08:00
Brian Goff
a346d7cb58
Merge pull request #27872 from vdemeester/images-filter-filters
...
Add reference filter and deprecated filter param…
Upstream-commit: de325535d4fe83f522e5daa78bdd8d4f9795513f
Component: engine
2016-11-11 11:24:19 -05:00
Kenfe-Mickael Laventure
9db7e23ff6
Remove extra binaries commit variables from windows build
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 17df5593ebcd471b0bbf0ea9d6e060ee3447850a
Component: engine
2016-11-11 08:24:17 -08:00
Kenfe-Mickael Laventure
c69704a7d0
Fix version detection for docker-init
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 69f0402585579ced62bca22551a6ef45672bb4fd
Component: engine
2016-11-11 08:19:32 -08:00
Sebastiaan van Stijn
bb992b4f94
Merge pull request #28297 from vdemeester/compose-swarm-openstdin
...
Add support for stdin_open in compose to swarm
Upstream-commit: e8469c0e63160174d00f60cdc2cc909593ab04b2
Component: engine
2016-11-11 17:09:04 +01:00
Alexander Morozov
db5b472d68
dockerversion: add other binaries to _lib.go
...
Otherwise it's impossible to build without autogen tag
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e60e54c12aa65c3c11c27bda3002b361f2c1e90f
Component: engine
2016-11-11 07:56:10 -08:00
Brian Goff
b09ce8ab95
Merge pull request #28299 from vdemeester/compose-swarm-extra_hosts
...
Add support for extra_hosts in compose to swarm
Upstream-commit: e0280c568aa8055d7179afd5928d000726136bed
Component: engine
2016-11-11 10:54:53 -05:00
Yong Tang
16cd9213ef
Add information for Manager Addresses in the output of docker info
...
As is specified in 28018, it would be useful to know the manager's addresses
even in a worker node. This is especially useful when there are many
worker nodes in a big cluster.
The information is available in `info.Swarm.RemoteManagers`.
This fix add the information of `Manager Addresses` to the output
of `docker info`, to explicitly show it.
A test has been added for this fix.
This fix fixes 28018.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 828bd441eb828072044175f3e6867c7218e434c5
Component: engine
2016-11-11 07:35:32 -08:00
Harald Albers
f1763d3779
Add bash completion for docker daemon --seccomp-profile
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 98a2071696d51479fb4d162ace95a9857a8a8643
Component: engine
2016-11-11 16:12:17 +01:00
Evan Hazlett
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
Vincent Demeester
e75f2fc3c8
Add reference filter and deprecated filter param…
...
… for `docker images`.
This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 820b809e70df8b9c7af00256182c48d935972a5c
Component: engine
2016-11-11 15:34:01 +01:00
Vincent Demeester
50bcf47873
Add support for extra_hosts in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f32869d956eb175f88fd0b16992d2377d8eae79c
Component: engine
2016-11-11 15:20:02 +01:00
Vincent Demeester
e846f5ae11
Add support for stdin_open in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 84450b72cd73161449bae16b8ad0010fcc4a07eb
Component: engine
2016-11-11 15:19:00 +01:00
Vincent Demeester
45eb178352
Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: bc739a8d70044263b1b71c28b8465fe2c84d3262
Component: engine
2016-11-11 15:18:34 +01:00
Brian Goff
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
Vincent Demeester
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
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
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
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
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
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
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
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
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
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
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
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
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