08d6a8b3d7
Merge pull request #28691 from aluzzardi/service-logs-no-follow
...
[experimental] service logs: Support no-follow mode
Upstream-commit: c025d5650433de503f0b415b7b5e120cfcd35b17
Component: engine
2016-11-22 13:48:14 -08:00
dc5227ef8f
Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
...
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 313502488e8809910127891d8923672baf43a742
Component: engine
2016-11-22 22:47:38 +01:00
9e9aefeaf8
update secret inspect to support IDs
...
This updates secret inspect to support inspect by ID in addition to name
as well as inspecting multiple secrets. This also cleans up the
help text for consistency.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 70d2cefd51e853ca4f3bbf8eb0386360809e026b
Component: engine
2016-11-22 16:01:16 -05:00
2b83a1645f
Merge pull request #28685 from darrenstahlmsft/RevendorGowinio
...
Revendor go-winio to v0.3.7
Upstream-commit: 61d9ba930ccf13a39d56f922798695819d239683
Component: engine
2016-11-22 21:35:45 +01:00
c76f65bd98
Merge pull request #28598 from darrenstahlmsft/VmcomputeDNE
...
Ensure vmcompute.dll exists during daemon start
Upstream-commit: 9d0050727d8cc9df8654e312eb53e09c6bca1140
Component: engine
2016-11-22 21:31:45 +01:00
4c1ce8ff4b
Merge pull request #28698 from YuPengZTE/devErrot
...
error strings should not be capitalized or end with punctuation
Upstream-commit: 86eae4018a06c0291f9572cd7f062f320b612698
Component: engine
2016-11-22 21:25:09 +01:00
2443044132
Merge pull request #28715 from thaJeztah/add-warning-for-windows-plugins
...
add note that windows does not support managed plugins
Upstream-commit: 0cbc187447bbce72ea50f8efc6596bfd23f7ede4
Component: engine
2016-11-22 21:23:13 +01:00
cbb630a1a7
Merge pull request #28703 from runcom/full-hash-commit-runc
...
hack/dockerfile/binaries-commits: use full commit hash for docker info
Upstream-commit: 658b89192f54285ace594add8114d30a6ea66a66
Component: engine
2016-11-22 21:14:00 +01:00
f8ede66132
Merge pull request #28681 from aboch/vnd
...
Vendor libkv @ 1d84310
Upstream-commit: d1a137b10ce9755da58b550256b067a414053552
Component: engine
2016-11-22 11:46:22 -08:00
650e1e1f00
Merge pull request #28672 from mlaventure/arm-ubuntu-xenial
...
Add support for armhf ubuntu-xenial deb
Upstream-commit: 6e11ca0fdf7f6b6ca313da46d545b069dda89f14
Component: engine
2016-11-22 19:57:11 +01:00
80569cdfd8
Revendor go-winio to v0.3.7
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 873a26697de8e1dfdc31c7151a7c4fdfd30f519a
Component: engine
2016-11-22 10:39:42 -08:00
ffb435aca9
Merge pull request #28668 from anusha-ragunathan/fix_teardown
...
Check for valid daemon in TearDownTest.
Upstream-commit: 39e2e075677969332edaea1ae2d58120f78e0a18
Component: engine
2016-11-22 13:26:08 -05:00
44b77bf83f
Merge pull request #28718 from albers/docs-fix-copmose
...
Fix typo in docs (Copmose)
Upstream-commit: 4bc96372d85039520359536cfbaaef3bda837a46
Component: engine
2016-11-22 19:25:47 +01:00
14f731c22d
Use container Mounts API for Swarm containers.
...
Instead of converting nicely typed service mounts into untyped `Binds`
when creating containers, use the new `Mounts` API which is a 1-1
mapping between service mounts and container mounts.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 821aeb6a6f72f070ae045cb7813759cbbaba7bda
Component: engine
2016-11-22 13:23:51 -05:00
419cdb27d7
Merge pull request #28595 from anusha-ragunathan/plugin_timeout
...
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: 677e14643c79184ca9d8123dd3e91e0444b1cac3
Component: engine
2016-11-22 10:17:10 -08:00
7c254a513d
Fix typo in docs (Copmose)
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2e120556872ee3ecd7f3b5cd4698e4195220c2ff
Component: engine
2016-11-22 19:09:30 +01:00
3aef405305
Merge pull request #28529 from allencloud/update-secret-create-url
...
fix secret create url for consistency
Upstream-commit: 772a423e08d6da2dbfebb22382270ea9d075a9a9
Component: engine
2016-11-22 09:55:17 -08:00
051270420d
plugins: support for devices
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 53b9b99e5cd19d9913c56c07276a2d4d83b9befd
Component: engine
2016-11-22 09:54:45 -08:00
1327cc36cf
Merge pull request #28709 from andrewhsu/fix-release-sh
...
skip solaris and allow dry run control points
Upstream-commit: e308f6bc01a045edba5325340b3b7e763dd8bab6
Component: engine
2016-11-22 09:52:07 -08:00
e3d6a1c7d6
Merge pull request #27625 from hqhq/add_deb_support
...
Add `make deb` support for aarch64
Upstream-commit: bae61194dbc080ffce679d4792d751170834662b
Component: engine
2016-11-22 18:24:58 +01:00
8251da003b
Add documentation for working on Engine API
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 109c54c481c7dafe88b622b87c0c7c172fed5ea1
Component: engine
2016-11-22 16:46:57 +00:00
77b0828f1e
Merge pull request #28700 from sdurrheimer/zsh-completion-images-filter-reference
...
Add zsh completion for 'docker image ls --filter reference'
Upstream-commit: 6aa7073c00920d7e25366dde9cc5451d7808c2ef
Component: engine
2016-11-22 17:00:38 +01:00
d30fb4f678
Merge pull request #28699 from sdurrheimer/zsh-completion-dockerd-userland-proxy-path
...
Add zsh completion for 'dockerd --userland-proxy-path'
Upstream-commit: 8f6ed2a47fad0656b2da76af72e670627d55028c
Component: engine
2016-11-22 17:00:10 +01:00
3da2e461d3
Add generate.sh for armhf deb Dockerfiles
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 3b3cf87478cc478c79116ed1f281a95955264eff
Component: engine
2016-11-22 07:12:57 -08:00
7ee0929419
Add support for armhf ubuntu-yakkety deb
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: b118056241430a28739128fdf7fc60b125a12c49
Component: engine
2016-11-22 07:09:10 -08:00
5d88abf962
add note that windows does not support managed plugins
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f885463b58f0608d9403a8b84d79320ffcce86a1
Component: engine
2016-11-22 16:01:14 +01:00
6540cdcdf9
Merge pull request #28711 from vdemeester/28635-fix-network-list-ignored
...
Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
Upstream-commit: c97919202659640347dd7c47d2dbd341440067aa
Component: engine
2016-11-22 09:57:08 -05:00
1e1f7ae102
Merge pull request #28445 from cpuguy83/28439_fix_client_rm_on_old_daemons
...
Handle `run --rm` against older daemons on the cli
Upstream-commit: c8388a52ec7a328b6aee3c48d31bd7f3e0b14aeb
Component: engine
2016-11-22 14:25:03 +01:00
910c4f2b83
Update swagger.yaml with changes to API
...
Up to and including 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 44c50807c6eadcb2371cc6bf8ba5f66ba9dcbe97
Component: engine
2016-11-22 12:49:38 +00:00
ff7908609b
Add version information to swagger.yaml
...
- Tidied up copy
- API version is now mandatory
- Links to previous API versions
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: c97f67dbab50f0efbf3c1e6a2862d29c76c9aec1
Component: engine
2016-11-22 12:49:38 +00:00
e5912f7d7e
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: f0d55cd081c6e8ad2a8222c787d54f9aae15723f
Component: engine
2016-11-22 12:49:38 +00:00
7e2e397a31
Move API reference to new location
...
See: https://github.com/docker/docker.github.io/pull/606
Also:
- Add missing redirects to API reference pages
- Remove v1.25 and 1.26, because they are being replaced with
swagger generated docs.
- Remove all other docs which aren't reference material, because
this can live in docker/docker.github.io
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 993854f58fa4132ff82c2e1ffe291d90b301db5a
Component: engine
2016-11-22 12:47:25 +00:00
b123ea8afd
Merge pull request #28651 from YuPengZTE/devMD002
...
First header should be a top level header
Upstream-commit: 48c3df015d3118b92032b7bdbf105b5e7617720d
Component: engine
2016-11-22 13:11:37 +01:00
ec58146d37
Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
...
This fixes services networks list to be ignored when loading.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 01b70a95c93b8442276fd312bac44a45ec859460
Component: engine
2016-11-22 13:09:17 +01:00
33dbfcc591
Merge pull request #28659 from xuzhenglun/master
...
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: d1258c761a9d2fac6c7830c77c7d8f91426bada3
Component: engine
2016-11-22 13:01:05 +01:00
b13fc57c66
Merge pull request #28682 from tonistiigi/stdin-close
...
Fix race on sending stdin close event
Upstream-commit: 3373227f368129070866df89777f03aca564f24b
Component: engine
2016-11-22 11:02:47 +00:00
7a0760001e
Merge pull request #28704 from YuPengZTE/devGenerate
...
hack/swagger-gen.sh is not exist
Upstream-commit: 0bcdeaefcfb47e7c75ec0cf78c029e002ae3e880
Component: engine
2016-11-22 11:01:19 +00:00
f2d9f7807d
Merge pull request #27628 from flixr/deb_armhf_ubuntu-xenial
...
build debian package for armhf ubuntu-xenial
Upstream-commit: f67c8163d4a298c651126e707e048e8975c8b4f5
Component: engine
2016-11-22 11:47:42 +01:00
1f31dcb95c
Merge pull request #28671 from darrenstahlmsft/RevendorHcshim
...
Update hcsshim to v0.5.9
Upstream-commit: fc488328b1f97165d2b80944a8f9887ae7268194
Component: engine
2016-11-22 10:48:20 +01:00
9eb244a92c
skip solaris and allow dry run control points
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: f60541069cca1a4c886f5c2198d2ccd07f4ee764
Component: engine
2016-11-22 01:42:52 -08:00
5f4c3b65c6
hack/swagger-gen.sh is not exist, it should be /hack/generate-swagger-api.sh
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: c471b7f2435f2cfa84d42876c35a04097593e864
Component: engine
2016-11-22 16:32:32 +08:00
d6934ae086
Merge pull request #28343 from albers/completion-build--network
...
Add bash completion for `docker build --network`
Upstream-commit: 7ca953e66ef3f71e9b909edbc7f0f23e00494427
Component: engine
2016-11-22 09:29:42 +01:00
6ac00da856
hack/dockerfile/binaries-commits: use full commit hash for docker info
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fa15d5ed0f96592b49c2e25c06e92d51999fb29b
Component: engine
2016-11-22 08:59:57 +01:00
33a0af4678
Add zsh completion for 'docker image ls --filter reference'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 15134b8d361895654b471a50c32f59ebc4a719ea
Component: engine
2016-11-22 08:01:45 +01:00
41c72b0885
Add zsh completion for 'dockerd --userland-proxy-path'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 97e189292278de10f2590f52eaf9b382c54bc99b
Component: engine
2016-11-22 07:57:31 +01:00
28a6abec82
error strings should not be capitalized or end with punctuation
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: fc11efa2dbf72bb493a24650860220a2d4b07c5e
Component: engine
2016-11-22 14:53:11 +08:00
47bad37f72
Add class to repository scope
...
Expose registry error translation for plugin distribution
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a12b466183e03621bc9e1c1e4deab6db8ec93f0a
Component: engine
2016-11-21 22:18:50 -08:00
e60b86d1ae
Update vendor distribution
...
Distribution client change for class in resource
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: d1f5e0f7a68d8a43931b834ce342830956bdac32
Component: engine
2016-11-21 22:18:41 -08:00
3bfc791696
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com >
Upstream-commit: d5dc9b8b1f5e693cfb3aace06e08e7fc6eb798d7
Component: engine
2016-11-22 10:42:55 +08:00
abd795e582
service logs: Support no-follow mode
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: c2d435e4f05d262aaa3d4d5cc2fe8965377eebdf
Component: engine
2016-11-21 18:02:13 -08:00
