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

2123 commits

Author SHA1 Message Date
YuPengZTE
fa378413f8 Fix the typo of URLs 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-10-19 17:46:27 +08:00
Sebastiaan van Stijn
194f04bbbe Merge pull request #27267 from ezrasilvera/plugin_fix 
Call the AuthZRes function also when the daemon  returns error
 2016-10-18 21:53:43 -07:00
Akihiro Suda
3a32b58792 Fix broken JSON support in cli/command/formatter 
How to test:

    $ docker ps --format '{{json .}}'
    $ docker network ls --format '{{json .}}'
    $ docker volume ls --format '{{json .}}'

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-10-17 08:07:17 +00:00
Sebastiaan van Stijn
21a79b503a Merge pull request #27366 from morelena/use_contains 
all: use strings.Contains instead Index
 2016-10-13 18:44:30 -07:00
Elena Morozova
a37027f6bd all: use strings.Contains instead Index 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
 2016-10-13 15:55:41 -07:00
Aaron Lehmann
245bd4c3d2 Merge pull request #27365 from morelena/remove_nil_check 
all: remove nil check for slices
 2016-10-13 15:27:37 -07:00
Elena Morozova
ace53bbe65 all: remove nil check for slices 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
 2016-10-13 13:55:38 -07:00
Elena Morozova
64238fef8c all: replace loop with single append 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
 2016-10-13 13:31:52 -07:00
Tibor Vass
8658748ef7 Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz 
Make authz use pluginv2
 2016-10-13 00:28:43 +02:00
Alexander Morozov
a616cf3b88 pkg/authorization: make it goroutine-safe 
It was racy on config reload

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-10-11 16:31:45 -07:00
Anusha Ragunathan
c5393ee147 Make authorization plugins use pluginv2. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-10-11 13:09:28 -07:00
Ezra Silvera
5a8ff40254 Call the AuthZRes function also when the daemon returns error 
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
 2016-10-11 09:53:30 +03:00
Tonis Tiigi
797f630d2e Reduce TestRunCommandWithTimeoutKilled flakiness 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-10 17:31:37 -07:00
Lei Jitang
6514299fa9 pkg/archive/changes_posix_test.go: un-comment code line "defer os.RemoveAll(src)" 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-10-10 05:23:24 -04:00
Justin Cormack
5ee2c2a647 Merge pull request #27160 from mlaventure/update-containerd 
Update containerd and runc
 2016-10-06 19:36:31 +02:00
Kenfe-Mickael Laventure
7e12c3bb99 Update containerd and runc 
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-05 14:47:15 -07:00
Josh Wilson
c0a5772668 Force input stream ANSI emulation for ConsoleZ 
This performs a similar check to the `"ConEmuANSI"` check that was recently
added to enable arrow keys navigation in docker container terminals.

Signed-off-by: Josh Wilson <josh.wilson@fivestars.com>
 2016-10-05 12:42:48 -07:00
Anusha Ragunathan
d599d53db2 Add plugingetter to pkg. 
plugingetter is indepedent of docker/docker packages, so it can be
moved to pkg. This is also necessary for authorization plugins (part of
pkg) to use pluginv2. The original path at plugin/getter will be
eventually removed, when external repos (eg. libnetwork) update their
import paths.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-10-04 12:03:29 -07:00
Tonis Tiigi
57e12037ac Fix error reporting in CopyFileWithTar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-09-30 11:46:37 -07:00
Christopher Jones
1a702111c6
Fix apparmor profile installation 
Fixes #26823

Fixes an issue where apparmor was not loaded into the kernel, because
apparmor_parser was being called incorrectly.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-09-29 18:47:20 -05:00
Anusha Ragunathan
af2e256249 Return pipeline errors correctly. 
To use a deferred func to overwrite the returned error requires using
the 'named' error. So reuse err, instead of pipelineError. Also, the old
pipelineError will never be nil, since its executed before the error can
be set.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-09-23 13:09:56 -07:00
Anusha Ragunathan
fefea805e9 Make graphdrivers work with pluginv2. 
As part of making graphdrivers support pluginv2, a PluginGetter
interface was necessary for cleaner separation and avoiding import
cycles.

This commit creates a PluginGetter interface and makes pluginStore
implement it. Then the pluginStore object is created in the daemon
(rather than by the plugin manager) and passed to plugin init as
well as to the different subsystems (eg. graphdrivers, volumedrivers).
A side effect of this change was that some code was moved out of
experimental. This is good, since plugin support will be stable soon.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-09-20 08:49:48 -07:00
Vincent Demeester
7a86930c74 Merge pull request #26436 from stevvooe/remove-transport-package 
client: remove transport package
 2016-09-20 16:43:56 +02:00
Antonio Murdaca
5c35bfed3f
Revert "Add default timeout to pkg/plugins/client" 
This reverts commit 0699b00d26.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-20 10:01:03 +02:00
John Howard
56952e2159 Merge pull request #26662 from WeiZhang555/fix-flaky-unit-test 
Fix flaky unit test
 2016-09-17 18:32:11 -07:00
John Howard
4a0419f536 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
 2016-09-17 09:31:24 -07:00
Zhang Wei
bc5768733d Fix flaky unit test 
Fix flaky test `TestHTTPTimeout` caused by precision problem.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-17 19:40:58 +08:00
John Howard
340e5233b2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 11:56:15 -07:00
Aaron Lehmann
a1fc3852da Merge pull request #26512 from AkihiroSuda/fix-pkg-plugins-racy-test 
[test] fix racy test in pkg/plugins
 2016-09-15 20:11:03 -07:00
Akihiro Suda
4bc908ec89 fix racy test in pkg/plugins 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-16 01:43:35 +00:00
Alexander Morozov
b2263c111f Merge pull request #26511 from AkihiroSuda/fix-pkg-archive-racy-test 
[test] fix racy tests in pkg/archive
 2016-09-15 11:10:34 -07:00
Aaron Lehmann
f8eab6fea8 progress: Rate limit progress bar output 
ProgressReader outputs progress information every 500 KB. This could be
excessive if something is being transfered at a fast rate. Rate-limit
progress output to 10 per second.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-09-14 17:23:16 -07:00
Akihiro Suda
62cbd2589f fix racy tests in pkg/archive 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-14 04:17:23 +00:00
Vincent Demeester
675144ff8d Merge pull request #26514 from AkihiroSuda/fix-pkg-integration-race 
[test] fix races in pkg/integration/cmd
 2016-09-13 15:18:41 +02:00
Aleksa Sarai
2f7596aaef
apparmor: do not save profile to /etc/apparmor.d 
Writing the profile to /etc/apparmor.d, while also manually loading it
into the kernel results in quite a bit of confusion. In addition, it
means that people using apparmor but have /etc mounted read-only cannot
use apparmor at all on a Docker host.

Fix this by writing the profile to a temporary directory and deleting it
after it's been inserted.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-09-13 16:25:16 +10:00
Akihiro Suda
e17f77ec51 fix races in pkg/integration/cmd 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-13 04:23:36 +00:00
Chun Chen
0699b00d26 Add default timeout to pkg/plugins/client 
Signed-off-by: Chun Chen <ramichen@tencent.com>
 2016-09-12 10:39:32 +08:00
Stephen J Day
9d7be9df8f tlsconfig: move Clone into proper package 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-09-09 12:05:17 -07:00
Michael Crosby
c1f2776bf1 Merge pull request #26428 from darrenstahlmsft/AddToSymlink 
Don't attempt to evaluate drive root on Windows
 2016-09-09 09:09:24 -07:00
Darren Stahl
fdce2a7775 Don't attempt to evaluate drive root on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-09-08 13:52:54 -07:00
Daniel Nephin
9c2b935812 Replace api/client imports with cli/command in experimental files. 
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:46:48 -04:00
Alexander Morozov
d959e7fac4 Merge pull request #26107 from dnephin/client_cleanup 
Shrink the DockerCLI type
 2016-09-08 12:18:46 -07:00
Aaron Lehmann
bc06542a17 Merge pull request #25523 from dmcgowan/fsync-layer-filestore 
Update layer store to sync transaction files before committing
 2016-09-08 10:03:12 -07:00
Daniel Nephin
a0ab33124a Extract stream output handling to a new type. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 12:33:41 -04:00
Brian Goff
28d18b8205 Merge pull request #25578 from rwilliams/conemu 
Force input stream ANSI emulation for ConEmu.
 2016-09-08 11:12:33 -04:00
Brian Goff
2381c7f18d Merge pull request #26281 from LK4D4/fix_multireader_offset 
pkg/ioutils: fix multireader SEEK_CUR branch
 2016-09-06 20:47:03 -04:00
Alexander Morozov
f3627c3726 pkg/ioutils: fix multireader SEEK_CUR branch 
Before getReaderForOffset returned always nil and wrong offset.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-06 11:08:35 -07:00
Tonis Tiigi
7a8c7b47cf Fix govet for go1.7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-09-02 19:07:54 -07:00
Michal Wieczorek
52c0daad82 fix spec file support for Windows plugin discovery (#25903) 
Signed-off-by: Michal Wieczorek <wieczorek-michal@wp.pl>
 2016-08-26 22:11:58 +02:00
Daniel Nephin
14712f9ff0 Remove old cli framework. 
Also consolidate the leftover packages under cli.
Remove pkg/mflag.
Make manpage generation work with new cobra layout.
Remove remaining mflag and fix tests after rebase with master.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-08-25 13:09:04 -04:00