docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
27,868 Commits 12 Branches 296 Tags
9bbfdc44ccfb443cccd99342db6a8af575fd29cc
Commit Graph

2119 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
e063aa0187 Merge pull request #27366 from morelena/use_contains 
all: use strings.Contains instead Index
Upstream-commit: 21a79b503a5c1331d0c000d26179a55fc235b021
Component: engine
 2016-10-13 18:44:30 -07:00
Elena Morozova
70177b59a1 all: use strings.Contains instead Index 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
Upstream-commit: a37027f6bdcb2f035fcccd99c6c6064934623a04
Component: engine
 2016-10-13 15:55:41 -07:00
Aaron Lehmann
b1d937a58f Merge pull request #27365 from morelena/remove_nil_check 
all: remove nil check for slices
Upstream-commit: 245bd4c3d2594fae3fd5099f29eef528a4c4accd
Component: engine
 2016-10-13 15:27:37 -07:00
Elena Morozova
17191e6609 all: remove nil check for slices 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
Upstream-commit: ace53bbe65d1384893027d046a5d4eae83bd60af
Component: engine
 2016-10-13 13:55:38 -07:00
Elena Morozova
4b9781e130 all: replace loop with single append 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
Upstream-commit: 64238fef8c7b739a2ae5648386cf594eb3a162e5
Component: engine
 2016-10-13 13:31:52 -07:00
Tibor Vass
1f94129ec0 Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz 
Make authz use pluginv2
Upstream-commit: 8658748ef716e43a5f6d834825d818012ed6e2c4
Component: engine
 2016-10-13 00:28:43 +02:00
Alexander Morozov
2a20bc38c9 pkg/authorization: make it goroutine-safe 
It was racy on config reload

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a616cf3b88ee264b9a565dc0c25e583444ba64e2
Component: engine
 2016-10-11 16:31:45 -07:00
Anusha Ragunathan
d71f1080b9 Make authorization plugins use pluginv2. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: c5393ee147e981ded8fdf12c8da790abd1130175
Component: engine
 2016-10-11 13:09:28 -07:00
Tonis Tiigi
f1f88179ba Reduce TestRunCommandWithTimeoutKilled flakiness 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 797f630d2e3c9180848b1adb7fd6fa879f284165
Component: engine
 2016-10-10 17:31:37 -07:00
Lei Jitang
e0f35ce34e pkg/archive/changes_posix_test.go: un-comment code line "defer os.RemoveAll(src)" 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 6514299fa9b716adbb04e67be583a335cd123398
Component: engine
 2016-10-10 05:23:24 -04:00
Justin Cormack
9ad2ffa17a Merge pull request #27160 from mlaventure/update-containerd 
Update containerd and runc
Upstream-commit: 5ee2c2a6475056f55327ce77b61677499a9e3fa8
Component: engine
 2016-10-06 19:36:31 +02:00
Kenfe-Mickael Laventure
6e5d016ba6 Update containerd and runc 
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7e12c3bb99381f117be73e05c187be6ce44280b9
Component: engine
 2016-10-05 14:47:15 -07:00
Josh Wilson
afe0671bd1 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>
Upstream-commit: c0a5772668c5a2cb6d17a6b5907fc3eb08d18cc7
Component: engine
 2016-10-05 12:42:48 -07:00
Anusha Ragunathan
7ec53d01f4 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>
Upstream-commit: d599d53db27f4a24b18f51464c39707eae383c7e
Component: engine
 2016-10-04 12:03:29 -07:00
Tonis Tiigi
5f25d3f4ea Fix error reporting in CopyFileWithTar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 57e12037ac8f8eb48cc05979c3030853d011dfea
Component: engine
 2016-09-30 11:46:37 -07:00
Christopher Jones
c15d8c9103 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>
Upstream-commit: 1a702111c61076e14f0e7ae688d0102128233daf
Component: engine
 2016-09-29 18:47:20 -05:00
Anusha Ragunathan
711fedae4a 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>
Upstream-commit: af2e2562494a11ee8e6ede58a29cc250935e74c4
Component: engine
 2016-09-23 13:09:56 -07:00
Anusha Ragunathan
f07146ebf8 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>
Upstream-commit: fefea805e930a67fb6327f8e59415932861358cb
Component: engine
 2016-09-20 08:49:48 -07:00
Vincent Demeester
90dfc08974 Merge pull request #26436 from stevvooe/remove-transport-package 
client: remove transport package 
Upstream-commit: 7a86930c7452e19ee72557bb8264e81378ccfbb5
Component: engine
 2016-09-20 16:43:56 +02:00
Antonio Murdaca
4cd6f89f27 Revert "Add default timeout to pkg/plugins/client" 
This reverts commit 0699b00d26a60f4a8447572b34c4aad1ce73d2e1.

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

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: bc5768733db79874d8918e8499df01d68cae2d6e
Component: engine
 2016-09-17 19:40:58 +08:00
John Howard
7342ae40e2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
 2016-09-16 11:56:15 -07:00
Aaron Lehmann
8f9c1794c9 Merge pull request #26512 from AkihiroSuda/fix-pkg-plugins-racy-test 
[test] fix racy test in pkg/plugins
Upstream-commit: a1fc3852dace4b07996b8189a236938d9e0e21ae
Component: engine
 2016-09-15 20:11:03 -07:00
Akihiro Suda
6bbb3e807c fix racy test in pkg/plugins 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 4bc908ec8910468711960a4bcd4f3ec8dce909fb
Component: engine
 2016-09-16 01:43:35 +00:00
Alexander Morozov
1a62240ad4 Merge pull request #26511 from AkihiroSuda/fix-pkg-archive-racy-test 
[test] fix racy tests in pkg/archive
Upstream-commit: b2263c111f1a0e8efc8646655c03fd73ce2d258b
Component: engine
 2016-09-15 11:10:34 -07:00
Aaron Lehmann
4a3b9d42c8 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>
Upstream-commit: f8eab6fea85f92aaa3c23bd0c87451a0811b5e3a
Component: engine
 2016-09-14 17:23:16 -07:00
Akihiro Suda
a658a7684d fix racy tests in pkg/archive 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 62cbd2589fb92c71711a323953f2713ab529e801
Component: engine
 2016-09-14 04:17:23 +00:00
Vincent Demeester
2f979c6743 Merge pull request #26514 from AkihiroSuda/fix-pkg-integration-race 
[test] fix races in pkg/integration/cmd
Upstream-commit: 675144ff8d251a97322859a78f28ed4f988d3a74
Component: engine
 2016-09-13 15:18:41 +02:00
Aleksa Sarai
d90edcd897 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>
Upstream-commit: 2f7596aaef3a9f8ec1f2d0937462d9263bee8b6b
Component: engine
 2016-09-13 16:25:16 +10:00
Akihiro Suda
3e11675204 fix races in pkg/integration/cmd 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: e17f77ec51f50f9c14c1acd36f1db6f5246b62e0
Component: engine
 2016-09-13 04:23:36 +00:00
Chun Chen
9a4ddab230 Add default timeout to pkg/plugins/client 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: 0699b00d26a60f4a8447572b34c4aad1ce73d2e1
Component: engine
 2016-09-12 10:39:32 +08:00
Stephen J Day
b73e4afba2 tlsconfig: move Clone into proper package 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9d7be9df8f79b26a4b9778851cf19a6579f8bc61
Component: engine
 2016-09-09 12:05:17 -07:00
Michael Crosby
5c50f1d40b Merge pull request #26428 from darrenstahlmsft/AddToSymlink 
Don't attempt to evaluate drive root on Windows
Upstream-commit: c1f2776bf1e8997e44d3c244e99104b3511b7255
Component: engine
 2016-09-09 09:09:24 -07:00
Darren Stahl
4e9c99c3b4 Don't attempt to evaluate drive root on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: fdce2a7775ec80d769f585c0a400c6cf6615776b
Component: engine
 2016-09-08 13:52:54 -07:00
Daniel Nephin
0238cc6815 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>
Upstream-commit: 9c2b9358125175db366ca000e6dae9af8dc88e2d
Component: engine
 2016-09-08 15:46:48 -04:00
Alexander Morozov
0b990a4b09 Merge pull request #26107 from dnephin/client_cleanup 
Shrink the DockerCLI type
Upstream-commit: d959e7fac4345762d26083a5d694871377f6dc75
Component: engine
 2016-09-08 12:18:46 -07:00
Aaron Lehmann
3b1269cdeb Merge pull request #25523 from dmcgowan/fsync-layer-filestore 
Update layer store to sync transaction files before committing
Upstream-commit: bc06542a1715273acc087dadd8179a88386dd6fb
Component: engine
 2016-09-08 10:03:12 -07:00
Daniel Nephin
e0295afbc4 Extract stream output handling to a new type. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a0ab33124a52853af611254cd73838e3d4407f51
Component: engine
 2016-09-08 12:33:41 -04:00
Brian Goff
5c0c4a4b23 Merge pull request #25578 from rwilliams/conemu 
Force input stream ANSI emulation for ConEmu.
Upstream-commit: 28d18b8205c813e18af96f0eb88850b2734077f4
Component: engine
 2016-09-08 11:12:33 -04:00
Brian Goff
669392fd60 Merge pull request #26281 from LK4D4/fix_multireader_offset 
pkg/ioutils: fix multireader SEEK_CUR branch
Upstream-commit: 2381c7f18df98b3ccc0b5a1236cd8e4ae57ba912
Component: engine
 2016-09-06 20:47:03 -04:00
Alexander Morozov
5b622d9c5a pkg/ioutils: fix multireader SEEK_CUR branch 
Before getReaderForOffset returned always nil and wrong offset.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f3627c37269d02bacec42831f5a791ae4fd0bc5e
Component: engine
 2016-09-06 11:08:35 -07:00
Tonis Tiigi
833a33ebb8 Fix govet for go1.7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
 2016-09-02 19:07:54 -07:00
Michal Wieczorek
7c9671c819 fix spec file support for Windows plugin discovery (#25903) 
Signed-off-by: Michal Wieczorek <wieczorek-michal@wp.pl>
Upstream-commit: 52c0daad82b424afc661c23c1d80784d014e1a58
Component: engine
 2016-08-26 22:11:58 +02:00
Daniel Nephin
e263ef28d9 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>
Upstream-commit: 14712f9ff0d20a3b64a60103608b8cc998909242
Component: engine
 2016-08-25 13:09:04 -04:00
Daniel Nephin
501f88a28e Add testutil/tempfile 
Improve error messages raised by assert.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7c556849aa7362cfa81ae316275e17eeb50bb52b
Component: engine
 2016-08-25 13:09:03 -04:00
Vincent Demeester
3a9a2cf24a Merge pull request #25967 from valgaze/feat/lewin 
Add Daniel Lewin to names collection
Upstream-commit: 4d590ba44a983ad881a2b44d8cd6ad6ebc5c6935
Component: engine
 2016-08-24 20:28:55 +02:00
Vincent Demeester
598c701bb9 Merge pull request #25959 from estesp/fail-on-graphdir-perms 
Don't start daemon in userns mode if graphdir inaccessible
Upstream-commit: 4a1b048c1539ca67c8be5fd3d12fe10f65ee600e
Component: engine
 2016-08-24 20:15:58 +02:00
Daniel Nephin
3db3e5b8dc Merge pull request #25426 from dnephin/better-int-testing-cmd 
Remove duplicate RunCommand functions used for integration-cli
Upstream-commit: b29558ed5d68712a40d840e289ada232f912659f
Component: engine
 2016-08-24 11:34:24 -04:00