369f49aace
Merge pull request #30351 from friism/patch-9
...
remove indent from .dockerignore example
Upstream-commit: 4f926b67f4ee2c1494332d7f1021e3fc45ef045a
Component: engine
2017-01-23 11:30:23 +01:00
fa90fa0714
Merge pull request #30272 from AkihiroSuda/fix-cli-json
...
Fix broken JSON support in cli/command/formatter
Upstream-commit: baecb6f499633b6df87d7e4a0631d9feb714358b
Component: engine
2017-01-23 11:03:18 +01:00
e1603a54f0
Merge pull request #30334 from mstanleyjones/master
...
Fixing formatting errors in Run refdoc
Upstream-commit: b319221c21228068c226b51e21ca767b348b423b
Component: engine
2017-01-22 23:02:59 +01:00
cbe273ba85
remove indent from .dockerignore example
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 0f5a98122f92d3fef520773ea619523129794fd7
Component: engine
2017-01-22 10:46:04 -08:00
6d01039fe4
Merge pull request #29959 from cpuguy83/master_fix_selinux_packaging
...
[master] Fix conflicts with newly updated selinux policies
Upstream-commit: 7a97705b52e7f5c65d31870579cb1dcc09506d89
Component: engine
2017-01-20 15:13:18 -08:00
05863e58e5
Merge pull request #30329 from johndmulhausen/patch-2
...
Fixing formatting errors in Run refdoc
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 74ed368e7a3a00b3fb24778763656d873293068d
Component: engine
2017-01-20 14:47:18 -08:00
d99ff4ff64
Merge pull request #30319 from vdemeester/integration-fix-testbuildcopywilcardinname
...
Run TestBuildCopyWilcardInName only on linux daemon and unix client
Upstream-commit: 0a08f7a1d4b3321154c03972bf34ecf603622830
Component: engine
2017-01-20 22:04:56 +00:00
58b37acff7
Merge pull request #30145 from anusha-ragunathan/ps-swarm
...
Pass plugingetter as part of swarm node config.
Upstream-commit: 2b89356c07b1824041985386d0c9485e49d9b987
Component: engine
2017-01-20 10:35:49 -08:00
f3a3b53a61
Merge pull request #30223 from mlaventure/fix-logwatcher-deadlock
...
Close logwatcher on context cancellation
Upstream-commit: 0566f3ffc46fbdf020e957fc30f56960152e057e
Component: engine
2017-01-20 10:14:37 -08:00
ec6f3b3f5b
Merge pull request #28454 from glensc/init-args
...
do not require custom build of tini
Upstream-commit: 50a72c7467ec92cb20b9ec72fd4de2d5e9761347
Component: engine
2017-01-20 10:03:58 -08:00
4e1939a186
Merge pull request #30282 from sdurrheimer/zsh-completion-swarm-join-availability
...
Add zsh completion for 'docker swarm --availability'
Upstream-commit: ae99820357877c010ee76892fb64068f1212e7ae
Component: engine
2017-01-20 17:52:06 +01:00
ae952f464c
Merge pull request #30317 from sdurrheimer/zsh-completion-prune-filter
...
Add zsh completion for 'docker {container,image,network,system} prune --filter
Upstream-commit: 156d402133849f74b9e9ac1c57a574fd9e552aee
Component: engine
2017-01-20 16:25:42 +01:00
6421d00c6a
Run TestBuildCopyWilcardInName only on linux daemon and unix client
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e47c46c713afc42430de339c6324632ef8830894
Component: engine
2017-01-20 16:10:28 +01:00
1f960a59bb
Add zsh completion for 'docker {container,image,network,system} prune --filter'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 784ebccffaa8329aee9e88877e6039b5002ad8e3
Component: engine
2017-01-20 15:49:21 +01:00
f421a18923
Merge pull request #29147 from Microsoft/jjh/makeroot
...
Windows: make.ps1 calc root
Upstream-commit: ba4f8f06b3cab866c58945a9b7a7f3735c855b32
Component: engine
2017-01-20 15:01:58 +01:00
0bc9ac7339
Merge pull request #27510 from chipironcin/master
...
Improve error message
Upstream-commit: 5b16c4c8001fb6d047228ad27a9c39f2ac0e6f5b
Component: engine
2017-01-20 21:47:30 +09:00
b4573da32a
Vendor swarmkit
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: eb13865d4e43d3084b017bf2b1287cff5e060b77
Component: engine
2017-01-19 17:20:33 -08:00
b01d142fdf
Pass plugingetter as part of swarm node config.
...
This is necessary for swarmkit to support cluster wide plugins, such as
globally scoped network plugins.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: fa784951ba0a29d436c60b7465167b5ef188d084
Component: engine
2017-01-19 17:11:12 -08:00
03bf74bac4
Merge pull request #29988 from yongtang/29936-insecure-registries
...
Return error when insecure registry contains scheme
Upstream-commit: af90d50647094f8d7813584a90c7a534c2bb610e
Component: engine
2017-01-19 21:49:06 +01:00
120ceec639
Merge pull request #29980 from allencloud/fix-29520-info-incorrectness
...
return error when listNode fails
Upstream-commit: a992ff9fec1ea89725c81ebba856f3b903f6ba1d
Component: engine
2017-01-19 10:41:02 -08:00
d24367c4ff
Merge pull request #30165 from xulike666/fix-typo-6/36
...
[combined] fix typo
Upstream-commit: de0328560b818e86fd3eadc973f90341e5c33498
Component: engine
2017-01-19 17:21:22 +01:00
aa09155ed2
Add zsh completion for 'docker swarm --availability'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ee2ce82c61c11b1c14f9febf811fbbc19d69b750
Component: engine
2017-01-19 16:54:36 +01:00
bff0390b15
Merge pull request #30267 from WeiZhang555/fix-misspell
...
Fix some typos
Upstream-commit: a3dff7c3dbb949662be0037de0e51c00cfa68364
Component: engine
2017-01-19 15:06:08 +01:00
dbf5d89403
Merge pull request #30266 from albers/completion--init
...
Add bash completion for `dockerd --init` and `docker run|create --init`
Upstream-commit: ee54d8eb27037eb4232a144c7618f612f8a51cf6
Component: engine
2017-01-19 15:05:44 +01:00
2bccbd2e65
Merge pull request #30259 from nishanttotla/dynamically-update-hostname
...
Make Docker automatically update hostname for Swarm node
Upstream-commit: 5c808268801e90f95f1dd8bc4f70c3f0434d6cb4
Component: engine
2017-01-19 10:35:50 +00:00
9977ce25d8
Fix broken JSON support in cli/command/formatter
...
How to test (it should not print `{}`, and just returns JSON with the actual data):
$ docker images --format '{{json .}}'
$ docker container stats --format '{{json .}}'
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 26013fcdd64221c858022392a1430a6c43eaaa26
Component: engine
2017-01-19 09:51:13 +00:00
2db1bd6f28
fix typo
...
fix typo I found AMAP in integration-cli/*
fix typo mentioned by Allencloud
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn >
Upstream-commit: 40af5691648c5b9d07b1231e3ed3be29fd66521a
Component: engine
2017-01-19 15:52:28 +08:00
377b3251ff
Fix some typos
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 827bbe90a0fc53342a85d2653d96b8ba55658adf
Component: engine
2017-01-19 15:29:28 +08:00
56fef9c9c4
Add bash completion for dockerd --init and docker run|create --init
...
Fixes #30263
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 20762617572f2e02b8e397844343083506144e86
Component: engine
2017-01-19 08:22:14 +01:00
b0c7dd934b
return error when listNode fails
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 8e04e9902a9739a13e5e824339082cc3d361d097
Component: engine
2017-01-19 14:02:06 +08:00
d6bce40c8a
Merge pull request #30218 from kevinetc123/patch-typo
...
fix a typo error
Upstream-commit: 7d0041f9e5dce58366a3ce09e75d82ce307cf28a
Component: engine
2017-01-19 14:34:19 +09:00
0bc7b63417
correct all the formate to formatter
...
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn >
Upstream-commit: b8155bd5bead29bf116aeea9159563e1a6409c41
Component: engine
2017-01-19 11:26:49 +08:00
ce34ab60cd
Make Docker automatically update hostname for Swarm node
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 8de8b1d520d4d60ccc813121f0c718b98efdc220
Component: engine
2017-01-18 15:55:53 -08:00
ae5b65a856
Merge pull request #30208 from justincormack/no-sqlite
...
Remove sqlite dependency
Upstream-commit: 0e8c7d72771847227df295471ac73180cbb3caa9
Component: engine
2017-01-18 13:15:38 -05:00
898356a3e3
Merge pull request #30185 from vdemeester/integration-build-cmd-cleanup-take2
...
[test-integration] Clean more build utils
Upstream-commit: e1c5e72902f1ec020fd7e179846d1faf06b281c6
Component: engine
2017-01-18 15:12:03 +01:00
140c56ac38
Merge pull request #28925 from daehyeok/ineffassign
...
Refactoring ineffectual assignments
Upstream-commit: 5eda0c59477a7364878351c3d311cd3a4c6dd28d
Component: engine
2017-01-18 15:01:57 +01:00
ecfeb35159
Remove sqlite
...
This drops support for migrations from pre-1.10 Docker versions, which
should be done via an external tool or an intermediate upgrade.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: f8119bb7a76b5c42defb6e0a2dc67bd77ad29a5e
Component: engine
2017-01-18 12:27:21 +00:00
52b418218f
Merge pull request #30041 from stevvooe/tips-for-successful-changes
...
CONTRIBUTING: add tips for succesful changes
Upstream-commit: 8bc7e193464b5b59a2019a4a429a48526f71bc40
Component: engine
2017-01-18 10:00:15 +01:00
9bc1ef59e1
Merge pull request #30230 from stupendous-man/fix-typos
...
Fixed a typo within pkg/authorization/api.go
Upstream-commit: 30ca9e3b0cfedddfe259c2d84a658b1eedc2cce1
Component: engine
2017-01-18 14:23:03 +09:00
9f4fb79889
Merge pull request #30215 from WeiZhang555/fix-go-vet
...
Fix escaped go vet error
Upstream-commit: d3245371176735763b0ef8a63609432586cdee3e
Component: engine
2017-01-18 12:48:22 +09:00
b1d58a6a62
Fixed a typo within pkg/authorization/api.go
...
Signed-off-by: Diego Romero <idiegoromero@gmail.com >
Upstream-commit: 48b8f54876ff3269db46443eb91adeab2ea8b74b
Component: engine
2017-01-17 21:51:16 -05:00
4173ac21ae
Merge pull request #30219 from tonistiigi/test-port-leak
...
Switch TestSwarmPublishDuplicatePorts to different ports
Upstream-commit: 56b951fbe526eeacaca434dbbabb59b07d3ba13e
Component: engine
2017-01-17 17:16:14 -08:00
67499ab5ac
Merge pull request #29076 from justincormack/seccomp-socket-to-them
...
Block obsolete and unusual socket families in the default seccomp profile
Upstream-commit: 48184351c938904236998b0f435f2dbc2a2c19f3
Component: engine
2017-01-18 01:53:17 +01:00
f5282be2f9
Close logwatcher on context cancellation
...
This commit addresses 2 issues:
1. in `tailfile()` if somehow the `logWatcher.Msg` were to become full and the watcher closed before space was made into it, we were getting stuck there forever since we were not checking for the watcher getting closed
2. when servicing `docker logs`, if the command was cancelled we were not closing the watcher (and hence notifying it to stop copying data)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: fb2bb3653e2755d971f21debfecbd7c878a3c23f
Component: engine
2017-01-17 14:36:13 -08:00
1a7bfab5ef
Merge pull request #30220 from ehazlett/fix-log-import
...
Remove cloudflare log import
Upstream-commit: 2169723538224563f998e002eef73377f007ad07
Component: engine
2017-01-17 14:21:36 -08:00
37ae130be7
Merge pull request #30212 from thaJeztah/here-come-the-captains
...
Welcome the captains :-)
Upstream-commit: 645bdc22ec120a6fb51bf74c8804536b0f7c7b55
Component: engine
2017-01-17 13:54:01 -08:00
dd7c3086b8
CONTRIBUTING: add tips for succesful changes
...
Expand the contributing doc to include tips for successful PRs and
guidance on commit messages. This should help contributers to have
better position PRs that are more likely to be merged.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 59e1d579e09b56cd909655fdefb405f0eb02b086
Component: engine
2017-01-17 13:15:26 -08:00
dad6f7464f
fix log import
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: e221b74bd192c83fe97c7581a135a7417cbc318c
Component: engine
2017-01-17 14:20:54 -05:00
85210563e9
Switch TestSwarmPublishDuplicatePorts to different ports
...
There is an issue with the ports leaking to other tests.
This is a workaround until the actual problem is addressed.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 24cd5444f982fd295248006f44c6ec2f4ab7f1f8
Component: engine
2017-01-17 10:54:22 -08:00
c28bd5178d
Merge pull request #29965 from yongtang/29946-networks-api
...
Return `[]` instead of `null` in case `filterNetworks` returns empty
Upstream-commit: f19a293dd741583c66001799435f784f2af455e0
Component: engine
2017-01-17 18:58:35 +01:00
