07ffcc9abc
Merge pull request #28189 from Microsoft/jjh/fluentd
...
Windows: Enable fluentd logdriver
Upstream-commit: bf960a6bdc3fae8c69b8ecf6bbc2562548f55929
Component: engine
2016-11-09 11:28:37 -05:00
15aa5ee667
Merge pull request #28197 from sdurrheimer/zsh-completion-image-subcommand
...
Add zsh completion for new 'docker image' subcommands
Upstream-commit: 51254847203ffa1df2f53950278d478b9cc38b0f
Component: engine
2016-11-09 10:30:55 -05:00
e788fbec24
Merge pull request #28141 from darrenstahlmsft/TerminateTemplates
...
Terminate template containers before delting a layer
Upstream-commit: 70b53c932dbc757c44ae7b18ad122b043fb82530
Component: engine
2016-11-09 15:44:33 +01:00
9c6b6dc40c
Merge pull request #27947 from milindchawre/fix_27798
...
Fixes #27798 : Update help for --blkio-weight parameter
Upstream-commit: 4f7083a04f1ad7ce84a30a412ee374c2a92afc95
Component: engine
2016-11-09 15:35:38 +01:00
0993a3cf62
Merge pull request #28201 from yuexiao-wang/test-func
...
Update function name for TestCalculBlockIO
Upstream-commit: 103641f5c6f1afee9c8f3d44d15f21ac950bc015
Component: engine
2016-11-09 15:34:25 +01:00
72ae55dd14
Merge pull request #28037 from crosbymichael/tini
...
Replace grimes with tini for default init shipped in Docker
Upstream-commit: 93e837d1d2d3a24b0219ccadc1fdf170d242c137
Component: engine
2016-11-09 09:29:42 -05:00
95ba56ed2a
Merge pull request #27733 from milindchawre/fix_update_delay
...
Fixes #24083 : Improving cli help for flags with duration option
Upstream-commit: bab1b2a0a40c9e4c2448f90cf034f5cd800cc2f8
Component: engine
2016-11-09 15:06:05 +01:00
d1564f5e36
Merge pull request #27329 from dattatrayakumbhar04/26639_nfs_volume_with_hostname
...
#26639 : Local NFS volumes do not resolve hostnames
Upstream-commit: 5020905e9d1a365bf6f23c432a09500fd80ca112
Component: engine
2016-11-09 13:46:56 +00:00
3cf5c6ee9d
Fixes #24083 : Improving cli help for flags with duration option
...
Signed-off-by: milindchawre <milindchawre@gmail.com >
Upstream-commit: ecb59a2283be35b2dba2951ed1542afe4e896d8a
Component: engine
2016-11-09 12:17:28 +00:00
a40c9e3002
Merge pull request #26088 from akirakoyasu/patch-fluent-unixsocket
...
Proposal: unix-sockets support in Fluentd logging driver
Upstream-commit: 806f09bf32c49cd0493a97522cd809b09b52dfb6
Component: engine
2016-11-09 12:49:06 +01:00
a66c2a4dd3
Update function name for TestCalculBlockIO
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 5ffe496a2233a0620099906e1cf2de24d5dfb56d
Component: engine
2016-11-09 17:43:10 +08:00
fef442cb37
Merge pull request #28098 from yongtang/25099-oom_score_adj-empty-env
...
Fix `/proc/<pid>/oom_score_adj: invalid argument` error caused by empty env name
Upstream-commit: c025049c27c2cc8a6f1f978769c89a1fdf07a6f3
Component: engine
2016-11-09 10:39:18 +01:00
c6ff6077d0
Merge pull request #28193 from yuexiao-wang/plugin-driver
...
Fix the link for plugin documentation
Upstream-commit: 79c37d148330ce3b6188976c67660555f27f078d
Component: engine
2016-11-09 10:25:06 +01:00
7198214971
Merge pull request #27997 from aaronlehmann/raft-options
...
cli: Add options for Raft snapshotting
Upstream-commit: 29a38a4fe8caebbad9ea72ca0d4b4fc80118df3c
Component: engine
2016-11-09 10:19:45 +01:00
7a0c275bc3
Merge pull request #27311 from darrenstahlmsft/CloseStdinError
...
Windows: Stop returning errors that should be ignored while closing stdin
Upstream-commit: 2ee6032c8887775d7aca5de8889374cb31a1e017
Component: engine
2016-11-09 00:17:04 -08:00
0d2e6f9d94
Cleanup after moving all zsh completion logics for the new image command
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 29367c7e684d1178612b36dcc550c354bf15b68d
Component: engine
2016-11-09 08:15:25 +01:00
2477845c35
Move zsh completion logic to new subcommand: tag
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cc879af088f6172f7b94fcfb94ef18716cd0c79f
Component: engine
2016-11-09 08:15:23 +01:00
cfdb60cb73
Move zsh completion logic to new subcommand: save
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d2af96342dcbc36dda58a1d1aeaa24072c7a8ee8
Component: engine
2016-11-09 08:15:22 +01:00
b343bd70e1
Move zsh completion logic to new subcommand: rm
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: e5c98f3887b1b6e2a0deb11bc5d371d5300ca2aa
Component: engine
2016-11-09 08:15:20 +01:00
733d81aad9
Move zsh completion logic to new subcommand: push
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 17cdc95a199aa8543aaa90359aa461ad5bf4240d
Component: engine
2016-11-09 08:15:18 +01:00
1edb788a77
Move zsh completion logic to new subcommand: pull
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 102742a3cdc3633c8adb28f4f6cccd5028b46039
Component: engine
2016-11-09 08:15:16 +01:00
5f05123095
Move zsh completion logic to new subcommand: ls
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: c333821334db2c8c1d8e4af73176ec8cdefe4643
Component: engine
2016-11-09 08:15:14 +01:00
58ef25601e
Move zsh completion logic to new subcommand: load
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: c308befdc0f8afa21c0ee7048cec1e5eca9c8da0
Component: engine
2016-11-09 08:15:13 +01:00
572723e3ba
Add zsh completion logic to new subcommand: inspect
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d0014299b420191ceef627ed8dda809914b9ff4c
Component: engine
2016-11-09 08:15:11 +01:00
d6334ea62f
Move zsh completion logic to new subcommand: import
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a4656e46f77c11aa27fa8e1f37398ea9b8c4738c
Component: engine
2016-11-09 08:15:10 +01:00
0144aba2f6
Move zsh completion logic to new subcommand: history
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 2014e787309d3eb1fcf26ffd324deef2c2177d7a
Component: engine
2016-11-09 08:15:08 +01:00
34207fe9ff
Move zsh completion logic to new subcommand: build
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d3305a17e11233451ed79cb6f2f0f6c8a9b03b94
Component: engine
2016-11-09 08:15:07 +01:00
4e97cf792b
Add zsh completion for 'docker image' subcommands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 53a56990c43985f1bacc0c87d92e7cb7743475ae
Component: engine
2016-11-09 08:15:05 +01:00
d0a8f76683
Rename zsh images & log complete functions
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 2a44da973200258cf80fb9693a4e84211ee3a3d9
Component: engine
2016-11-09 08:14:40 +01:00
395c5f43b8
Fix the link for plugin documentation
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 701021ebd8f7bba22347be71f58563506fcc7b74
Component: engine
2016-11-09 13:50:14 +08:00
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
7242352354
Stop returning errors that should be ignored while closing stdin
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ae35c0f70e96de011ad376c8fffba8e8a52ec21f
Component: engine
2016-11-08 18:25:43 -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
40ba948937
Terminate template VMs on layer delete
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: c58e8dea6ce1e9ff02c383c1698733fd0554ba2e
Component: engine
2016-11-08 15:39:25 -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
f7a65041fc
Convert err description to lower
...
Convert this to lower before checking the message of the error.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 47637b49a0fbd62a25702859f0993666c63ff562
Component: engine
2016-11-08 14:42:54 -08:00
64d7644ec8
Replace grimes with tini
...
There is no reason to duplicate efforts and tini is well built and
better than grimes. It is a much stronger option for the default init
and @krallin has done a great job maintaining it and helping make
changes so that it will work with Docker.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d58b47623b252803f5cd12f6d9ca584d1587ab22
Component: engine
2016-11-08 14:42:54 -08:00
