docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
27,852 Commits 12 Branches 297 Tags
755707be54d09fb3bdbc4d0268e42da34a7559c6
Commit Graph

26133 Commits

Author SHA1 Message Date
Elena Morozova
755707be54 integration-cli: move Close() after error check 
Signed-off-by: Elena Morozova <lelenanam@gmail.com>
Upstream-commit: 2b9786a9b3ed00dbc3b11b673e7a52a02ed0b4d6
Component: engine
 2016-10-13 16:07:08 -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
Alexander Morozov
0ed22443d3 Merge pull request #27360 from morelena/loop_append 
all: replace loop with single append
Upstream-commit: f299335e6e100426f3dfb6707b27044f1fdcf12c
Component: engine
 2016-10-13 14:52:59 -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
Alexander Morozov
02f69e1006 Merge pull request #27338 from yuexiao-wang/instream-err 
Fix the incorrect description for NewInStream
Upstream-commit: f1e5349a0353fdbb591e526b52bd32185550f146
Component: engine
 2016-10-13 12:32:43 -07:00
Tõnis Tiigi
3f0929f048 Merge pull request #27276 from yuexiao-wang/func-name 
Modify function name from SetDaemonLogLevel to SetLogLevel
Upstream-commit: 62503f245f808a6847fe98a84bacfe5ed3bf5c18
Component: engine
 2016-10-13 12:10:59 -07:00
yuexiao-wang
a29a28104a Fix the incorrect description for NewInStream 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 90bddb4243d29e11b2add2f25849fcfce7ee17ec
Component: engine
 2016-10-13 22:33:09 +08:00
Tibor Vass
2bbf5bd013 Merge pull request #27296 from tonistiigi/wait-tasks 
Wait until tasks have been created in TestSwarmTaskListFilter
Upstream-commit: 535f52c932c24056cf535f0f7aa8cadc880b2194
Component: engine
 2016-10-13 15:02:43 +02:00
Tibor Vass
18a9c67a1b Merge pull request #27300 from tonistiigi/rm-checkpoint-methods 
Remove checkpoint methods from builder backend
Upstream-commit: 33cc13466380552bcfd2001b0be053ec8b49a9bd
Component: engine
 2016-10-13 15:02:23 +02:00
Jean-Pierre Huynh
ea86ba3aa3 Update Jess' github handle after she decided to break the internet 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 30e61051af33cf9499f7aa6480e291bd1e2ec405
Component: engine
 2016-10-13 11:36:05 +01:00
Sebastiaan van Stijn
9d1492de52 Merge pull request #27207 from tonistiigi/deprecate-repo-shortid 
Deprecate repo:shortid syntax
Upstream-commit: 0542dcc2d05d74081d185c35bc4a92716f348506
Component: engine
 2016-10-12 23:44:38 -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
Victor Vieux
dc941b3238 Merge pull request #27325 from tonistiigi/net-tests 
Add requirements for tests that require network
Upstream-commit: aba3a9980492b46515c4c09a8f499fa5ede6123d
Component: engine
 2016-10-12 15:08:50 -07:00
Victor Vieux
00595c5ad4 add 1.12.2 changelog 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: f77a31a58a01ae3aace6839170794025d0111b95
Component: engine
 2016-10-12 13:12:08 -07:00
Tõnis Tiigi
ca7f41fc0a Merge pull request #27305 from yongtang/27294-docs-Size-RefCount 
Update docs for `Size` and `RefCount` for `UsageData`
Upstream-commit: 98d19efe50554227539698bb60b97d65ba0cfbab
Component: engine
 2016-10-12 11:51:21 -07:00
Tõnis Tiigi
1895cd51cf Merge pull request #27308 from LK4D4/fix_racy_auth 
pkg/authorization: make it goroutine-safe
Upstream-commit: c8e8be847850298e8d771c5b501c32f505a875b8
Component: engine
 2016-10-12 11:18:59 -07:00
Tonis Tiigi
eb62ebf173 Add requirements for tests that require network 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: da9ef68f06e9c73b0913a53dbe31fce3244536a2
Component: engine
 2016-10-12 11:11:23 -07:00
John Howard
955590ce96 Merge pull request #27310 from swernli/servicing-error-reporting 
Fixing error reporting on servicing failure
Upstream-commit: e736b9a1725bcac02589a7bf61f21c2a0490203d
Component: engine
 2016-10-12 08:47:54 -07:00
Vincent Demeester
2db92bdde1 Merge pull request #27217 from Microsoft/jjh/servicingcitest 
Windows: Test for container servicing
Upstream-commit: 9db46989294621ca63b200a690921ceb62c63db8
Component: engine
 2016-10-12 15:50:52 +02:00
Vincent Demeester
8578df04ed Merge pull request #27225 from darrenstahlmsft/CreateTests 
Windows: Enable more create tests
Upstream-commit: 310068f6068bc1d46a5faec65b092c085635bf2c
Component: engine
 2016-10-12 15:08:32 +02:00
Tibor Vass
56ddd45521 Merge pull request #27314 from AkihiroSuda/mask-sys-firmware-2 
oci/defaults_linux.go: mask /sys/firmware
Upstream-commit: 8d1d9eebe3ded3105216dc9a88cc94d16ac6198c
Component: engine
 2016-10-12 14:10:12 +02:00
Tibor Vass
d029c5d315 Merge pull request #27301 from aboch/cfg 
Update required modules for overlay dataplane encryption
Upstream-commit: 625e9f786aeba8d14e72094a948918524c4247af
Component: engine
 2016-10-12 14:07:18 +02:00
Akihiro Suda
f93e5a0e13 oci/defaults_linux.go: mask /sys/firmware 
On typical x86_64 machines, /sys/firmware can contain SMBIOS and ACPI tables.
There is no need to expose the directory to containers.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 8b1772c86b20d06ae6bd8ccf4b20f6df4cd86b62
Component: engine
 2016-10-12 06:07:13 +00:00
Stefan J. Wernli
77b18735c8 Fixing error reporting on servicing failure 
The code that handles waiting for the servicing container to complete correctly grabs the exit code and logs a failure, but doesn't return that failure to the caller, mistakenly causing servicing operations to look successful when they really failed during processing.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: f65647463eb8e6ba0675d295aed492d3617306a2
Component: engine
 2016-10-11 17:11:56 -07: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
Stephen J Day
96a5105111 client: deterministically resolve http scheme 
The docker client has historically used Transport.TLSClientConfig to set
the scheme for the API client. A recent moved the resolution to use the
http.Transport directly, rather than save the TLSClientConfig state on a
client struct. This caused issues when mutliple calls made with a single
client would have this field set in the http package on pre-1.7
installations. This fix detects the presence of the TLSClientConfig once
and sets the scheme accordingly.

We still don't know why this issue doesn't happen with Go 1.7 but it
must be more deterministic in the newer version.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 401778b7e2ccfba31190537de847fcdbce745bd2
Component: engine
 2016-10-11 15:53:14 -07:00
Aaron Lehmann
30c8a928f4 Merge pull request #26804 from stevvooe/clear-tlsconfig-unix-socket 
client: pedantic checking of tlsconfig
Upstream-commit: 9bd8c1d3321d1b264e84ff5fba4dc04730c264f3
Component: engine
 2016-10-11 15:47:47 -07:00
Yong Tang
340a49b4b2 Update docs for Size and RefCount for UsageData 
In 27294, `Size` and `RefCount` has been wrapped into `UsageData`
and is only exposed in `GET system/df`. Though the docs was not
updated in `docker_remote_api_v1.25.md`.

This fix updates the docs to refect the changes for `UsageData`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a68047fe688f59c390b2e8b210d57ff6857e833a
Component: engine
 2016-10-11 15:41:00 -07:00
Sebastiaan van Stijn
fa70234a33 Merge pull request #27294 from mlaventure/hide-unused-volume-fields 
Move types.Volumes optional fields under a new type
Upstream-commit: a7db0a8402c5e770501adb7a1efb82adff65e3f8
Component: engine
 2016-10-11 23:55:25 +02:00
Alessandro Boch
3cf3d53749 Update required modules for overlay dataplane encryption 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 275013ce8b769082b723c4eec0850b10e6dfb7be
Component: engine
 2016-10-11 14:06:55 -07:00
Tonis Tiigi
c39b9d6194 Remove checkpoint methods from builder backend 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5fb3b4205a8b0635ff193791ef581939806eb8da
Component: engine
 2016-10-11 14:00:29 -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
Anusha Ragunathan
a97d7743a8 Vendor libnetwork. 
This is primarily for plugingetter import path change.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 1845f506e4dad6916fd10564e2c8b0b18f43a7c9
Component: engine
 2016-10-11 13:09:01 -07:00
Tianon Gravi
60ebef1784 Merge pull request #27005 from lizzha/azurechina 
Use the mirror in China for Azure China environment
Upstream-commit: 8d6e9f0c6ac6c77dee3b5a984c19c699660f7abb
Component: engine
 2016-10-11 13:04:11 -07:00
Tonis Tiigi
29de0702ce Wait until tasks have been created in TestSwarmTaskListFilter 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f8229aea9f21c44933374b17176caeb3f28f459c
Component: engine
 2016-10-11 11:56:42 -07:00
Kenfe-Mickael Laventure
3dd231fb94 Move types.Volumes optional fields under a new type 
This allows us to hide those fields when they are not filled.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: d36952749d7db1a7dac40f7ddf3ed485f23b33fc
Component: engine
 2016-10-11 11:49:26 -07:00
Anusha Ragunathan
effa6f4094 Update plugingetter import path in docker/docker. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: a98be0344b24d71235c17a87ff425f3d602e48e8
Component: engine
 2016-10-11 11:24:18 -07:00
Alexander Morozov
12339e1063 Merge pull request #27271 from tonistiigi/fix-test-timeout 
Reduce TestRunCommandWithTimeoutKilled flakiness
Upstream-commit: 61753568f5e482c551df6f3693cb7c942261b7de
Component: engine
 2016-10-11 09:24:13 -07:00
Sebastiaan van Stijn
2722bc3d62 Merge pull request #26565 from justincormack/pinata-bundle 
Add a script to install a bundle into Docker for Mac
Upstream-commit: c98571b8f8a6e2140492e057a66c2b2b9741af33
Component: engine
 2016-10-11 16:17:49 +02:00
Sebastiaan van Stijn
5a907ff50f Merge pull request #26782 from cdrage/add-nat-check-to-script 
Add check for CONFIG_IP_NF_NAT to kernel check
Upstream-commit: 45d346291463a594090b96b28d110539f2d66502
Component: engine
 2016-10-11 15:14:53 +02:00
Madhu Venugopal
9dfec63192 Merge pull request #26954 from mrjana/net 
Vendoring libnetwork @7b74403
Upstream-commit: 5ff17cb4aae435715733c169fce21a3677cd21a7
Component: engine
 2016-10-11 05:59:35 -07:00
Sebastiaan van Stijn
e8a02789bc Merge pull request #26896 from jmzwcn/issue26244 
Fix issue26244:swarm service, with overlay network, fails to remove all containers
Upstream-commit: f7d1682c604429fcdf3c2c2225bde324b0861780
Component: engine
 2016-10-11 14:40:39 +02:00
Vincent Demeester
d0516ab406 Merge pull request #26970 from wzhliang/restart-stopped-container 
zsh: allow restarting stopped containers by id
Upstream-commit: 6b997739fe5f4de411ccf30be574ee11a2780018
Component: engine
 2016-10-11 14:37:54 +02:00
yuexiao-wang
a44c26a0a1 Modify function name from SetDaemonLogLevel to SetLogLevel 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: fe3ff54c7a87d475d5b2a799c5c85e6300c371db
Component: engine
 2016-10-11 19:35:12 +08:00
Sebastiaan van Stijn
48cd323c6e Merge pull request #26894 from thaJeztah/improve-log-level-help 
Improve --log-level help text
Upstream-commit: f65bf11e267b1788da12b5af5f41b44ce160cf69
Component: engine
 2016-10-11 12:35:42 +02:00
Liz Zhang
2e79f0c54a Use the mirror in China for Azure China environment 
Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Use the mirror in China for Azure China environment

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update option name to --mirror

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update indent and change variable name

Signed-off-by: Liz Zhang <lizzha@microsoft.com>
Upstream-commit: 451979a368c0fcb7990bcce82122609a7b412428
Component: engine
 2016-10-11 17:27:18 +08:00
Justin Cormack
23ee37555b Merge pull request #26690 from mwhudson/ignore-oom_score_adj-failure 
Ignore failure to set oom_score_adj, as happens in an unprivileged container.
Upstream-commit: d316e172da464bd7fb88e45069cb459f90f710bd
Component: engine
 2016-10-11 10:01:22 +01: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
John Howard
70c250faf0 Windows: Update go-winio to 0.3.5 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 97ac469934051c5275d5130287d4a8eece84a412
Component: engine
 2016-10-10 15:08:17 -07:00