e57bdfb80c
Windows: Enable fluentd logdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cff9679c6cdd0b7f3dc691ed00f294ac93274c1d
Component: engine
2016-11-08 19:54:57 -08:00
5689e4e9c3
Merge pull request #28185 from Microsoft/jjh/concurrentaccess
...
Windows: Avoid concurrent access to sysinfo
Upstream-commit: 64a42d656b14a754192c8e682047ca36d92666bc
Component: engine
2016-11-08 19:22:09 -08:00
0fd78d838a
Merge pull request #27745 from vieux/cli_backward_compose_api
...
allow client to talk to an older server
Upstream-commit: d3c780bb90cb5a087fdbffbb8be14fa5eaacca10
Component: engine
2016-11-08 18:27:23 -08:00
389ad4c08e
Windows: Avoid concurrent access to sysinfo
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 54e09aa4e26c60deb74f994a08e96abea8fb857e
Component: engine
2016-11-08 17:52:38 -08:00
fc16f27149
Merge pull request #28088 from aluzzardi/service-ps-task-resolution
...
service ps: Truncate Task IDs
Upstream-commit: 383a2f046b16c9f79d2fb800844e6550cc784871
Component: engine
2016-11-08 17:44:15 -08:00
cc2d08fb86
Merge pull request #27567 from yongtang/24391-dns-setting
...
Add custom DNS settings to service definition
Upstream-commit: 462e57f05eba94cacad2c5e1383d94baf8fe090b
Component: engine
2016-11-08 17:43:00 -08:00
0d0bda3a4b
Merge pull request #28171 from tonistiigi/fix-fifo-rm-warn
...
Don’t warn on missing fifo
Upstream-commit: c3c58f83b6e49e792e7bb355a0fbe5d1d308cf82
Component: engine
2016-11-08 17:42:15 -08:00
5a46073d11
Merge pull request #28086 from vieux/delete_rootfs_plugin
...
delete plugin rootfs on `docker plugin rm`
Upstream-commit: 4b63ad33ec77dbf15879da8ce8a7870d58f562bd
Component: engine
2016-11-08 17:03:01 -08:00
067ec4c6cd
Merge pull request #27420 from Shugyousha/journaldfixes
...
Small logger journald cleanup
Upstream-commit: 3975d648b70f2f18c1ba15c4b590de5c418d34db
Component: engine
2016-11-09 01:35:08 +01:00
e52aa72e3a
service ps: Truncate Task IDs
...
- Refactored to move resolution code into the idresolver
- Made `ps` output more bearable by shortening service IDs in task names
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: d296f7a391b54cc5a0b0a80a9d735e7e47a96c86
Component: engine
2016-11-08 16:17:15 -08:00
df125f380f
Merge pull request #27992 from Microsoft/jjh/minapitoinfo
...
Adds `MinAPIVersion` to docker version
Upstream-commit: 2d4203222574623b10d94817b9959a08698f516b
Component: engine
2016-11-08 15:49:33 -08:00
647428d26f
Add custom DNS settings to service update
...
This fix adds `--dns-add`, `--dns-rm`, `--dns-opt-add`, `--dns-opt-rm`,
`--dns-search-add` and `--dns-search-rm` to `service update`.
An integration test and a unit test have been added to cover the changes in this fix.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a39c0cf00780c021e98f638ab7edf151a8adb789
Component: engine
2016-11-08 15:41:32 -08:00
6fb775ea79
Add custom DNS settings to service definition
...
This fix tries to fix the issue raised in 24391 about allowing
custom DNS settings to service definition.
This fix adds `DNSConfig` (`Nameservers`, `Options`, `Search`) to
service definition, as well as `--dns`, `--dns-opt`, and `dns-search`
to `service create`.
An integration test has been added to cover the changes in this fix.
This fix fixes 24391.
A PR in swarmkit will be created separately.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9e8adbecf505620a1cb3a840189b59450493a00b
Component: engine
2016-11-08 15:41:32 -08:00
99c60f0c89
Merge pull request #28175 from Microsoft/jjh/hcsshim0.5.6
...
Revendor Microsoft/HCSShim v0.5.7
Upstream-commit: 703dcbe579bb4b463ddc8758eb22c3a9ba8202a3
Component: engine
2016-11-09 00:37:13 +01:00
08da55efb1
Merge pull request #28142 from vieux/plugin_install_args
...
support settings in docker plugins install
Upstream-commit: c33fb1013d9a06c0efd5f29efa2aaa5a412476f2
Component: engine
2016-11-08 15:05:39 -08:00
db11fea742
Merge pull request #27123 from tonistiigi/fix-join-reconnect
...
Don’t attempt to reconnect swarm on failed join after timeout
Upstream-commit: 0ccbae04370f8c48a6ae0ff2fc4181347f89e11d
Component: engine
2016-11-08 14:53:44 -08:00
df37726742
Merge pull request #28167 from mlaventure/update-containerd
...
Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
Upstream-commit: ff41cecc17d1396c8aec195610e2f72906160469
Component: engine
2016-11-08 14:25:16 -08:00
bfad529f12
Merge pull request #28170 from icecrime/poule_rebuild_all
...
poule: add `rebuild/*` to rebuild all at once
Upstream-commit: 4c6db5d9cb4021dab3021008648d2d56f08792cd
Component: engine
2016-11-08 22:37:33 +01:00
dba3070e3b
Merge pull request #28178 from Microsoft/jjh/limited-typo
...
Fix typo 'limitied' in error message
Upstream-commit: bbb645e84b683b00abab4a01538e5ee466a71f2e
Component: engine
2016-11-08 13:36:03 -08:00
8101ecbf52
Fix typo limitied
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 27de9f6ece0f62dbdf2a6bfa12cf3019f25e78fa
Component: engine
2016-11-08 13:06:24 -08:00
226e7112f7
Revendor Microsoft/HCSShim v0.5.7
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8ae916064375693862346f7fbbf3a79aff14d811
Component: engine
2016-11-08 12:09:11 -08:00
05466ddbca
Merge pull request #28147 from yongtang/27567-service-update-docs-plural-form
...
Change to plural forms for help output of `docker service update`
Upstream-commit: fb9aca312802870add3a88d45d7a1c45f7fab327
Component: engine
2016-11-08 11:14:40 -08:00
a91e44839b
Merge pull request #28166 from vdemeester/dont-use-pkg-integration-in-other-pkg
...
Remove use of pkg/integration in pkg/idtools
Upstream-commit: ffccf2cab95e05d5c5a883bfe3475ee65a84b16c
Component: engine
2016-11-08 10:43:45 -08:00
00b0b30b49
Clean up journald logger
...
We clean up the journald logger with these four changes.
1. Make field array static
2. Make function name more appropriate
3. Initialize the file descriptors only once
4. Avoid copying the journald cursor
Point 4 is the most significant change: instead of treating the journald
cursor like a Go string we use it as a raw C.char pointer. That way we
avoid the copying by the C.CString and C.GoString functions.
Signed-off-by: Silvan Jegen <s.jegen@gmail.com >
Upstream-commit: d359daaa487e68d187cc30c9da8fc08a158c7f79
Component: engine
2016-11-08 19:09:59 +01:00
28d4c9907d
Don’t warn on missing fifo
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ee9d28bd3fa3fb98a231a76bf4908397d63fec1d
Component: engine
2016-11-08 09:59:49 -08:00
20482eac18
Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
...
This version:
- properly follow context cancellation on Start and Exec
- add support for Solaris
- ensure exec exit events are always seen before init's
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 0aa17f0f6090ddeefaa6a0bc618aeb8baf3afa3f
Component: engine
2016-11-08 09:47:41 -08:00
5433abf008
Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls
...
support show numbers of global service in service ls command
Upstream-commit: a70b1d74a040e2c17bba1fe553ccbd293a64703a
Component: engine
2016-11-08 18:43:53 +01:00
e79ab7a217
poule: add rebuild/* to rebuild all at once
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 3d89d694eab1313a66958a3e4b63194935559129
Component: engine
2016-11-08 09:42:09 -08:00
4b60a6ae97
Merge pull request #28140 from tonistiigi/update-fifo
...
vendor: update fifo to 14056439
Upstream-commit: 16ea0806f8c49f7126d0c244ca363d2327ba7e50
Component: engine
2016-11-08 12:31:03 -05:00
e5fe6e7966
Merge pull request #27466 from mrjana/net
...
Retry AttachNetwork when it fails to find network
Upstream-commit: 9a61bd05f8c86be2a7f03d57f29991abaae20e5a
Component: engine
2016-11-08 18:25:45 +01:00
d0ecad688d
Remove use of pkg/integration in pkg/idtools
...
This remove a dependency on `go-check` (and more) when using
`pkg/idtools`. `pkg/integration` should never be called from any other
package then `integration`.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: acf7ce1aa0bcaaf0b541b695ce5fbd22676e9239
Component: engine
2016-11-08 17:21:02 +01:00
dc4e39cec4
Merge pull request #28130 from tophj-ibm/change-jq-syntax-for-old-version-support
...
[integration-cli] changes syntax to support older version of jq
Upstream-commit: 3a5a0ef1d4df99452da3f21955030abaf29a2642
Component: engine
2016-11-08 14:00:59 +00:00
770f488176
Merge pull request #28152 from AkihiroSuda/fix-tmpfs-ro-mount
...
api: fix ReadOnly support for tmpfs
Upstream-commit: 8a396f90f5ff32aee36ada3cfd0a1ed214f0e88e
Component: engine
2016-11-08 08:59:48 -05:00
533d6e45ea
Change to plural forms for help output of docker service update
...
This fix is based on the comment in
https://github.com/docker/docker/pull/27567#discussion_r86910604
Basically, in the help output of `docker service update`, the `--xxx-add`
flags typically have plural forms while `--xxx-rm` flags have singular
forms.
This fix updates the help output for consistency.
This fix also updates the related docs in `service_update.md`.
The help output in `service_update.md` has been quite out-of-sync
with the actual output so this fix replaces the output with the
most up-to-date output.
This fix is related to #27567 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1b42d9d0db4f1eadf0a70424ff829bb3346f7bd9
Component: engine
2016-11-08 05:53:56 -08:00
d78d9594ad
Merge pull request #28158 from lixiaobing10051267/masterMakeSum
...
fix using wrong function name for MakeTarSumContext
Upstream-commit: 189727581be77049f7f3234894c3966639808e89
Component: engine
2016-11-08 22:37:23 +09:00
988bfccd70
Merge pull request #28157 from yuexiao-wang/update-checkpoint
...
Update for docker checkpoint
Upstream-commit: cbc511720ab13bff05a66c9fa72f5354b2c7bc94
Component: engine
2016-11-08 22:36:22 +09:00
d0ebaa81e8
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com >
allow client to talk to an older server
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: e98e4a71110fd33852bb755a9b8b4ebc9df904db
Component: engine
2016-11-08 04:55:27 -08:00
b1990eccbb
Merge pull request #28143 from icecrime/poule
...
Add poule.yml
Upstream-commit: 14a06cbb29b6100e5705d777ce42b3a375a54542
Component: engine
2016-11-08 13:09:09 +01:00
032d1bd1bd
Merge pull request #28153 from YuPengZTE/devCtx
...
context.Context should be the first parameter of a function
Upstream-commit: ec221643587a6c22b7e0ab20087ce97100285fb9
Component: engine
2016-11-08 12:40:32 +01:00
d07b461649
Merge pull request #28144 from yongtang/11072016-swarmkit-update
...
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
Upstream-commit: 2fa63c90de627423be54a929cb6b023e84123b34
Component: engine
2016-11-08 12:39:03 +01:00
2153863109
delete plugin rootfs on plugin rm
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 586b7cc19ef289b0f60a859ca75ec6a9eb97120d
Component: engine
2016-11-08 03:30:37 -08:00
379e810a82
Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand
...
Add zsh completion for new 'docker container' subcommands
Upstream-commit: d46c7109b520bfe485b4c9ca5f59a3768b444aa0
Component: engine
2016-11-08 11:24:28 +01:00
bea6724b50
Merge pull request #28038 from bfirsh/add-validate-swagger
...
Validation for swagger.yaml
Upstream-commit: 9075aa4ddd9f721fda24704de5d54bf36445e330
Component: engine
2016-11-08 10:57:01 +01:00
7c8e31f530
fix using wrong function name for MakeTarSumContext
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 71f144648af71d8daa6481464707b4f8a9476a3c
Component: engine
2016-11-08 17:16:13 +08:00
f95b21c73c
Update for docker checkpoint
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 90ce77e46a7d84ff801624e105b6c00749d3286c
Component: engine
2016-11-08 16:56:29 +08:00
2879129b44
Merge pull request #28117 from ping035627/ping035627-patch-1107
...
Modify to improve code readability
Upstream-commit: f5283bd253868b6f27b833e7eb7b6c36d45d2096
Component: engine
2016-11-08 09:44:45 +01:00
b9dd501a68
Merge pull request #28156 from albers/completion-service-create--tty
...
Add bash completion for `docker service {create,update} --tty`
Upstream-commit: c48c44371b31cf4b3fdb39b2bb209a64debc04c2
Component: engine
2016-11-08 09:35:17 +01:00
2b57d0c977
support show numbers of global service in service ls command
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ea03f090b8e0d5530c50857f54d8e961f9139b92
Component: engine
2016-11-08 16:17:15 +08:00
08efaac2fe
Add bash completion for docker service {create,update} --tty
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: bfd8f7a7e15a0a4eece33e545368e915470147e0
Component: engine
2016-11-08 09:13:23 +01:00
9cafe2a9d5
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 4b86bd050b6e4c944407680d99c9ce6f25b8cc53
Component: engine
2016-11-08 14:51:17 +08:00
