toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,535 Commits 3 Branches 295 Tags
d23c572e2b02dcd70baf4d769c5e4e3783f77242
Commit Graph
23535 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Qiang Wu(Kennan) d23c572e2b Fix deprecated format for security-opt 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 0b207e75585cd4ba9a40460d87766052dd7508a7
Component: engine
 2016-04-07 02:09:18 +00:00
John Howard 86db45237f Merge pull request #21733 from Microsoft/sjw/updatepending 
Adding postRunProcessing infrastructure for hanlding Windows Update.
Upstream-commit: 9d7f6bb921d7ea9a0954fe0e4e7612742935a540
Component: engine
 2016-04-06 15:36:39 -07:00
Tibor Vass 5d96f48931 Merge pull request #21691 from tonistiigi/fix-gccgo-make 
Fix building gccgo from makefile
Upstream-commit: 76aefc18f988d1c21382e3be88edcb6c99a91ea7
Component: engine
 2016-04-06 17:31:59 -04:00
Sebastiaan van Stijn 303525ea6c Merge pull request #21810 from aboch/vnd 
Vendoring libnetwork v0.7.0-rc.4
Upstream-commit: d82e522e36a6d1ce89185bcddd05511c0a074eed
Component: engine
 2016-04-06 14:18:33 -07:00
Alexander Morozov fd21ba82c6 Merge pull request #21809 from Microsoft/jjh/tp4removal 
Windows: Remove TP4 support from main codebase
Upstream-commit: 65464d11f1b1aac6a5b9792cb599e23f376d169d
Component: engine
 2016-04-06 14:11:33 -07:00
Stefan J. Wernli a1edae7884 Adding postRunProcessing infrastructure for hanlding Windows Update. 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 818a5198e4a76cd63ff84a7796ff3b0b91302552
Component: engine
 2016-04-06 14:03:05 -07:00
Phil Estes 1ca23d3d69 Merge pull request #21805 from LK4D4/unused_stuff 
all: remove some unused funcs and variables
Upstream-commit: 40dc921da21e4f1fd165f1d7da87d600e3eb8609
Component: engine
 2016-04-06 16:27:14 -04:00
Vincent Demeester 5da6bec3ad Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys 
Client print error when specify wrong detach keys
Upstream-commit: 5709f8e4227e0e1da333739c44003a3f47279bd5
Component: engine
 2016-04-06 22:14:14 +02:00
Tibor Vass 2d2dce7886 Merge pull request #21794 from coolljt0725/cleanipc_quiet 
Don't throw error on clenaup ipc mounts if it does not exists
Upstream-commit: 02297d5a33958abac7d83ee8ec5aada32152db79
Component: engine
 2016-04-06 16:10:53 -04:00
Sebastiaan van Stijn ab040ceb02 Merge pull request #21783 from vieux/fix_21772 
do not trim one char from {{.Names}} each time it is used in --format
Upstream-commit: 2bbe75cdb62d4f53c6bd3f1586aa782b7b116f31
Component: engine
 2016-04-06 13:01:22 -07:00
Tibor Vass 5ada0d9d57 Merge pull request #21723 from devimc/master 
Fix compilation errors with btrfs-progs-4.5
Upstream-commit: 8c361eb5da51318168d7d1bd2214f7369de28394
Component: engine
 2016-04-06 15:56:42 -04:00
Tibor Vass 1735136bd7 Merge pull request #21802 from tiborvass/carry-21716 
Carry 21716: When container had no layer data, cleanupContainer crashed
Upstream-commit: 6bd429cb2aabfed7a39748aa3fefd047883f893a
Component: engine
 2016-04-06 15:21:38 -04:00
Alessandro Boch f0315af665 Vendoring libnetwork v0.7.0-rc.4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 8a957bafa58e2eed8f31722c7fcc3709ca509a29
Component: engine
 2016-04-06 12:18:21 -07:00
John Howard 9f10b4351a Windows: Remove TP4 support from main code 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 331c8a86d489e573fcbf1df3c4f813bbc3168624
Component: engine
 2016-04-06 12:12:20 -07:00
Brian Goff feab92573f Merge pull request #21768 from shishir-a412ed/fix_docker_run 
Ignore os.IsNotExist errors when calling ToDiskLocking 
Upstream-commit: 40ccb7114e7aceca38e66b365d4f54e4f4d64d0c
Component: engine
 2016-04-06 14:12:38 -04:00
Victor Vieux 0dfaed7e71 do not trim one char from {{.Names}} each time it is used in --format 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 68ade49adab15429168903f5600ab64ce7f7c8c5
Component: engine
 2016-04-06 11:04:13 -07:00
Alexander Morozov db8e9f9830 Merge pull request #21804 from mlaventure/arm-fix 
Skip migration unit test on non amd64 platform
Upstream-commit: 27f50c40e6d2fffaf0bb7811f9c602943fea5e24
Component: engine
 2016-04-06 11:01:23 -07:00
Tibor Vass e6a7fb2bb7 Merge pull request #21780 from sanimej/libn-v0.7rc2 
Vendor Libnetwork v0.7.0-rc.3
Upstream-commit: a79e79c58e7da0ab8519e708271f0e45a341c3d2
Component: engine
 2016-04-06 13:54:21 -04:00
Alexander Morozov 842746c494 all: remove some unused funcs and variables 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5ee8652a21756b1b4719e3477bd871d13b237c12
Component: engine
 2016-04-06 10:40:01 -07:00
Sebastiaan van Stijn 0812102c29 Merge pull request #21787 from npcode/fix-docs-plugin-api-markdown 
Fix incorrect markdown rendering
Upstream-commit: 636e7760e2413e5871dad5492506ee77b7b4a020
Component: engine
 2016-04-06 10:18:11 -07:00
Sebastiaan van Stijn ceda4e4efa Merge pull request #21712 from yongtang/21335-docs-container-with-volumes 
Remote API docs give incorrect example for creating a container with volumes.
Upstream-commit: 3d800dc0192d0d246b0c1888bbe94aca5d52e1d2
Component: engine
 2016-04-06 10:15:37 -07:00
Kenfe-Mickael Laventure 617f2a3290 Skip migration unit test on non amd64 platform 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: cf73ebf280c6a1ac8106bb8374f990fe08f221d8
Component: engine
 2016-04-06 10:10:58 -07:00
Sebastiaan van Stijn 7d665b791e Merge pull request #21799 from coolljt0725/fix_docs 
Correct the description of --group-add in run.md
Upstream-commit: bbcbed3b54ca5e1ed4f23bb4bf58397e8f7d645b
Component: engine
 2016-04-06 10:02:32 -07:00
Sebastiaan van Stijn a1eda98892 Merge pull request #21790 from thaJeztah/carry-21241-explain-build-cache 
[carry 21241] explain the impact on build caching more clearly
Upstream-commit: 0e5694412b267b13ec00b1c159beef3930eeed38
Component: engine
 2016-04-06 10:00:11 -07:00
mYmNeo 8c0c7b5da7 when container had no layer data, cleanupContainer crashed 
Signed-off-by: mYmNeo <thomassong@tencent.com>
Upstream-commit: 0bfc9c8de07cb2ad716d522952b2901080161909
Component: engine
 2016-04-06 12:40:20 -04:00
mYmNeo 09e9f13707 fix TestCreateShrinkRootfs and TestCreateShrinkRootfs 
Signed-off-by: mYmNeo <thomassong@tencent.com>
Upstream-commit: ce87de21a7594f5d49987a7333f1f0e77984f117
Component: engine
 2016-04-06 12:40:20 -04:00
mYmNeo d1ab71d43b fix test requirement about devicemapper and not overlay 
Signed-off-by: mYmNeo <thomassong@tencent.com>
Upstream-commit: 90f512427f3a10144a8f589ea9b18d36cf48b94c
Component: engine
 2016-04-06 12:40:19 -04:00
Tibor Vass 3cc8db1e5f Merge pull request #21751 from tonistiigi/runc-maskedpaths 
Define readonly/mask paths in spec
Upstream-commit: c7cf2450537cf5f5f6d24067447376402ddf2680
Component: engine
 2016-04-06 12:16:28 -04:00
Shishir Mahajan 10e0c5235b Ignore os.IsNotExist errors when calling ToDiskLocking 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 606cf5310d20518b4a9dfbe4d8e6b872f8683d9e
Component: engine
 2016-04-06 11:17:56 -04:00
John Howard d2a9e8f78b Merge pull request #21669 from msabansal/expose 
Enabling expose support for Windows TP5
Upstream-commit: f3da0c9055ea73dec1d793d4ff524a58ad67f635
Component: engine
 2016-04-06 07:52:07 -07:00
Brian Goff 64b8205ed9 Merge pull request #21795 from mountkin/refactor-init 
refactor the init function in docker_utils.go
Upstream-commit: e24673def241339303064aeac939d4f86c992915
Component: engine
 2016-04-06 10:39:55 -04:00
Brian Goff 56bc32d248 Merge pull request #21779 from Microsoft/jjh/dockerfile 
Windows: Dockerfile for TP5
Upstream-commit: 891023617ab8ddc04848db52439080f9127e99b7
Component: engine
 2016-04-06 10:23:53 -04:00
Brian Goff 0a0b5dbea9 Merge pull request #21785 from Microsoft/jjh/nodeletenat 
Windows: integration-cli don't delete nat
Upstream-commit: c760ea3d93b075c19806f532e637d586631a0303
Component: engine
 2016-04-06 10:20:58 -04:00
Lei Jitang d8939e35f7 Correct the description of --group-add in run.md 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9a7f2e726885386f57d115f8652b0ae87b20dce6
Component: engine
 2016-04-06 21:52:10 +08:00
Shijiang Wei 855667c0f1 refactor the init function in docker_utils.go 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 50d5d55f566b65b506bf54ccf0d897a0cb95734e
Component: engine
 2016-04-06 20:16:00 +08:00
Lei Jitang 0894026fe2 Don't throw error on clenaup ipc mounts if it does not exists 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5bd1786387bdb0af2e665fecde3ac08f8db61008
Component: engine
 2016-04-06 07:34:31 -04:00
mikelinjie 09c84ecb5a make the cache miss clear 
Signed-off-by: mikelinjie <294893458@qq.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 66b8714da4e92b3587cbbf25116541f4de63169e
Component: engine
 2016-04-06 00:48:21 -07:00
Lei Jitang 528f77fe0b Merge pull request #21789 from npcode/docs-plugins-authorization-null 
Use 'null' instead of 'nil' for json
Upstream-commit: bb9b17314df38756af70b060838e751756e5a646
Component: engine
 2016-04-06 15:29:40 +08:00
Yi EungJun fc217ad034 Use 'null' instead of 'nil' for json 
When describe json response, 'null' is better than 'nil' which is not in
json specification.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 2f69d7689dcb2ed95093599f0acef7d5445f83b0
Component: engine
 2016-04-06 16:13:48 +09:00
Yi EungJun e6c32c7ee7 Fix incorrect markdown rendering 
The docker document site [1] rendered the list of plugin implements
incorrectly.

[1]: https://docs.docker.com/engine/extend/plugin_api

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 4a698c9c43804df1d6096e09ff682477efae3431
Component: engine
 2016-04-06 15:37:49 +09:00
Santhosh Manohar 219d5e639e Vendor Libnetwork v0.7.0-rc.3 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 5b892819a60a0a91c168c6a2c1e22c958be143ca
Component: engine
 2016-04-05 22:01:19 -07:00
Aaron Lehmann 476df032fb Merge pull request #21767 from allencloud/fix-typos 
fix typos
Upstream-commit: 81b01b44c66203d6cb1d7b277a716593055523cb
Component: engine
 2016-04-05 20:32:14 -07:00
allencloud a6d5134cf6 fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 34700cc1f3cf663dc4eecacbb6f06240ad679919
Component: engine
 2016-04-06 10:35:01 +08:00
John Howard c818e1117c Windows: integration-cli don't delete nat 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d6ab2ad36d8c184bd7ea140df8b4894eff42b02d
Component: engine
 2016-04-05 19:29:43 -07:00
John Howard 3d85a4f240 Windows: Dockerfile for TP5 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 83809de7d45d3465977b2f7a7cf585863cec445c
Component: engine
 2016-04-05 19:08:20 -07:00
John Howard 5c35f01162 Merge pull request #21272 from Microsoft/jstarks/manifest_updates 
Add os_version and os_features to Image
Upstream-commit: fc9912fd00f5e12a6f0904f3c758275724ba3318
Component: engine
 2016-04-05 16:16:25 -07:00
Alexander Morozov 9344bce56a Merge pull request #21755 from cpuguy83/bytespipe_allocs 
Improve performance/reduce allocs of bytespipe
Upstream-commit: 806a8e22b96900bc1db5541d316c1cd91c493bea
Component: engine
 2016-04-05 14:43:57 -07:00
Brian Goff 933477cfba Improve performance/reduce allocs of bytespipe 
Creates a `fixedBuffer` type that is used to encapsulate functionality
for reading/writing from the underlying byte slices.

Uses lazily-loaded set of sync.Pools for storing buffers that are no
longer needed so they can be re-used.

```
benchmark                     old ns/op     new ns/op     delta
BenchmarkBytesPipeWrite-8     138469        48985         -64.62%
BenchmarkBytesPipeRead-8      130922        56601         -56.77%

benchmark                     old allocs     new allocs     delta
BenchmarkBytesPipeWrite-8     18             8              -55.56%
BenchmarkBytesPipeRead-8      0              0              +0.00%

benchmark                     old bytes     new bytes     delta
BenchmarkBytesPipeWrite-8     66903         1649          -97.54%
BenchmarkBytesPipeRead-8      0             1             +Inf%
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9a25b1d942da88439ec04797ff6f1c33c3b5562d
Component: engine
 2016-04-05 13:06:04 -04:00
Vincent Demeester a581305764 Merge pull request #21763 from larsbutler/names-generator-comment-typo-fix 
Fix spelling error in names-generator.go
Upstream-commit: 83bc8d2b8c0afcf339cd24e19a472db8aa3514e5
Component: engine
 2016-04-05 13:58:14 +02:00
Lars Butler a1bd3ee5e1 Fix spelling error in names-generator.go 
Signed-off-by: Lars Butler <Lars.Butler@gmail.com>
Upstream-commit: 0cad90911f8b9fab9b9acc940b5759ee1939306e
Component: engine
 2016-04-05 12:34:52 +02:00