beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
30411 commits 14 branches 412 tags 338 MiB
Commit graph

30411 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Dougherty
2b30a79d9e
Replace "kickass" in name generator with "vigorous" 
Having curse words in container names can get awkward.

Closes #30374.

Signed-off-by: Steve Dougherty <steve@asksteved.com>
 2017-01-31 21:33:23 -05:00
Vincent Demeester
4f926b67f4 Merge pull request #30351 from friism/patch-9 
remove indent from .dockerignore example
 2017-01-23 11:30:23 +01:00
Vincent Demeester
baecb6f499 Merge pull request #30272 from AkihiroSuda/fix-cli-json 
Fix broken JSON support in cli/command/formatter
 2017-01-23 11:03:18 +01:00
Sebastiaan van Stijn
b319221c21 Merge pull request #30334 from mstanleyjones/master 
Fixing formatting errors in Run refdoc
 2017-01-22 23:02:59 +01:00
Michael Friis
0f5a98122f remove indent from .dockerignore example 
Signed-off-by: Michael Friis <friism@gmail.com>
 2017-01-22 10:46:04 -08:00
Tibor Vass
7a97705b52 Merge pull request #29959 from cpuguy83/master_fix_selinux_packaging 
[master] Fix conflicts with newly updated selinux policies
 2017-01-20 15:13:18 -08:00
Victor Vieux
74ed368e7a Merge pull request #30329 from johndmulhausen/patch-2 
Fixing formatting errors in Run refdoc

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-01-20 14:47:18 -08:00
Justin Cormack
0a08f7a1d4 Merge pull request #30319 from vdemeester/integration-fix-testbuildcopywilcardinname 
Run TestBuildCopyWilcardInName only on linux daemon and unix client
 2017-01-20 22:04:56 +00:00
Tibor Vass
2b89356c07 Merge pull request #30145 from anusha-ragunathan/ps-swarm 
Pass plugingetter as part of swarm node config.
 2017-01-20 10:35:49 -08:00
Tõnis Tiigi
0566f3ffc4 Merge pull request #30223 from mlaventure/fix-logwatcher-deadlock 
Close logwatcher on context cancellation
 2017-01-20 10:14:37 -08:00
Alexander Morozov
50a72c7467 Merge pull request #28454 from glensc/init-args 
do not require custom build of tini
 2017-01-20 10:03:58 -08:00
Sebastiaan van Stijn
ae99820357 Merge pull request #30282 from sdurrheimer/zsh-completion-swarm-join-availability 
Add zsh completion for 'docker swarm --availability'
 2017-01-20 17:52:06 +01:00
Sebastiaan van Stijn
156d402133 Merge pull request #30317 from sdurrheimer/zsh-completion-prune-filter 
Add zsh completion for 'docker {container,image,network,system} prune --filter
 2017-01-20 16:25:42 +01:00
Vincent Demeester
e47c46c713
Run TestBuildCopyWilcardInName only on linux daemon and unix client 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-20 16:10:28 +01:00
Steve Durrheimer
784ebccffa
Add zsh completion for 'docker {container,image,network,system} prune --filter' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-01-20 15:49:21 +01:00
Vincent Demeester
ba4f8f06b3 Merge pull request #29147 from Microsoft/jjh/makeroot 
Windows: make.ps1 calc root
 2017-01-20 15:01:58 +01:00
Akihiro Suda
5b16c4c800 Merge pull request #27510 from chipironcin/master 
Improve error message
 2017-01-20 21:47:30 +09:00
Anusha Ragunathan
eb13865d4e Vendor swarmkit 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-01-19 17:20:33 -08:00
Anusha Ragunathan
fa784951ba 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>
 2017-01-19 17:11:12 -08:00
Sebastiaan van Stijn
af90d50647 Merge pull request #29988 from yongtang/29936-insecure-registries 
Return error when insecure registry contains scheme
 2017-01-19 21:49:06 +01:00
Aaron Lehmann
a992ff9fec Merge pull request #29980 from allencloud/fix-29520-info-incorrectness 
return error when listNode fails
 2017-01-19 10:41:02 -08:00
Sebastiaan van Stijn
de0328560b Merge pull request #30165 from xulike666/fix-typo-6/36 
[combined] fix typo
 2017-01-19 17:21:22 +01:00
Steve Durrheimer
ee2ce82c61
Add zsh completion for 'docker swarm --availability' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-01-19 16:54:36 +01:00
Vincent Demeester
a3dff7c3db Merge pull request #30267 from WeiZhang555/fix-misspell 
Fix some typos
 2017-01-19 15:06:08 +01:00
Vincent Demeester
ee54d8eb27 Merge pull request #30266 from albers/completion--init 
Add bash completion for `dockerd --init` and `docker run|create --init`
 2017-01-19 15:05:44 +01:00
Justin Cormack
5c80826880 Merge pull request #30259 from nishanttotla/dynamically-update-hostname 
Make Docker automatically update hostname for Swarm node
 2017-01-19 10:35:50 +00:00
Akihiro Suda
26013fcdd6 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>
 2017-01-19 09:51:13 +00:00
Aaron.L.Xu
40af569164 fix typo 
fix typo I found AMAP in integration-cli/*

fix typo mentioned by Allencloud

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-01-19 15:52:28 +08:00
Zhang Wei
827bbe90a0 Fix some typos 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-01-19 15:29:28 +08:00
Harald Albers
2076261757 Add bash completion for dockerd --init and docker run|create --init 
Fixes #30263

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-01-19 08:22:14 +01:00
allencloud
8e04e9902a return error when listNode fails 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-01-19 14:02:06 +08:00
Akihiro Suda
7d0041f9e5 Merge pull request #30218 from kevinetc123/patch-typo 
fix a typo error
 2017-01-19 14:34:19 +09:00
kaiwentan
b8155bd5be correct all the formate to formatter 
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn>
 2017-01-19 11:26:49 +08:00
Nishant Totla
8de8b1d520
Make Docker automatically update hostname for Swarm node 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-01-18 15:55:53 -08:00
Brian Goff
0e8c7d7277 Merge pull request #30208 from justincormack/no-sqlite 
Remove sqlite dependency
 2017-01-18 13:15:38 -05:00
Sebastiaan van Stijn
e1c5e72902 Merge pull request #30185 from vdemeester/integration-build-cmd-cleanup-take2 
[test-integration] Clean more build utils
 2017-01-18 15:12:03 +01:00
Sebastiaan van Stijn
5eda0c5947 Merge pull request #28925 from daehyeok/ineffassign 
Refactoring ineffectual assignments
 2017-01-18 15:01:57 +01:00
Justin Cormack
f8119bb7a7 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>
 2017-01-18 12:27:21 +00:00
Vincent Demeester
8bc7e19346 Merge pull request #30041 from stevvooe/tips-for-successful-changes 
CONTRIBUTING: add tips for succesful changes
 2017-01-18 10:00:15 +01:00
Akihiro Suda
30ca9e3b0c Merge pull request #30230 from stupendous-man/fix-typos 
Fixed a typo within pkg/authorization/api.go
 2017-01-18 14:23:03 +09:00
Akihiro Suda
d324537117 Merge pull request #30215 from WeiZhang555/fix-go-vet 
Fix escaped go vet error
 2017-01-18 12:48:22 +09:00
Diego Romero
48b8f54876 Fixed a typo within pkg/authorization/api.go 
Signed-off-by: Diego Romero <idiegoromero@gmail.com>
 2017-01-17 21:51:16 -05:00
Tõnis Tiigi
56b951fbe5 Merge pull request #30219 from tonistiigi/test-port-leak 
Switch TestSwarmPublishDuplicatePorts to different ports
 2017-01-17 17:16:14 -08:00
Sebastiaan van Stijn
48184351c9 Merge pull request #29076 from justincormack/seccomp-socket-to-them 
Block obsolete and unusual socket families in the default seccomp profile
 2017-01-18 01:53:17 +01:00
Kenfe-Mickael Laventure
fb2bb3653e 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>
 2017-01-17 14:36:13 -08:00
Alexander Morozov
2169723538 Merge pull request #30220 from ehazlett/fix-log-import 
Remove cloudflare log import
 2017-01-17 14:21:36 -08:00
Kenfe-Mickaël Laventure
645bdc22ec Merge pull request #30212 from thaJeztah/here-come-the-captains 
Welcome the captains :-)
 2017-01-17 13:54:01 -08:00
Stephen J Day
59e1d579e0
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>
 2017-01-17 13:15:26 -08:00
Evan Hazlett
e221b74bd1
fix log import 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-01-17 14:20:54 -05:00
Tonis Tiigi
24cd5444f9 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>
 2017-01-17 10:54:22 -08:00