toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,756 Commits 3 Branches 295 Tags
8cd702acc5ddfb5c19ddd188b128a5473fca2e7a
Commit Graph
23756 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tonis Tiigi 7db547d6f1 Fix flaky TestSaveLoadParents 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0c0198a5e671928b67db6a3be35f1a419f633af4
Component: engine
 2016-04-06 21:58:47 -07:00
Zhang Wei 6a3a5e1d71 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 5fdbce3185913b82f516938deedb954c612d7d5d
Component: engine
 2016-04-07 12:46:55 +08:00
Tonis Tiigi 4b68403613 Fix closing attach streams on lost tcp connection 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a47cd639158ee9cfd228c0ae8257301b8510f3ad
Component: engine
 2016-04-06 21:27:47 -07:00
Derek McGowan bab358354a Fix overlay test running on overlay 
Overlay tests were failing when /var/tmp was an overlay mount with a misleading message.
Now overlay tests will be skipped when attempting to be run on overlay.
Tests will now use the TMPDIR environment variable instead of only /var/tmp

Fixes #21686

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 824c72f4727504e3a8d37f87ce88733c560d4129
Component: engine
 2016-04-06 21:06:42 -07:00
Jess Frazelle 9358edbd4e Merge pull request #21821 from vieux/make_help 
add `make help`
Upstream-commit: da0985fd16ef642856a249cd523f5c043748e6a5
Component: engine
 2016-04-07 02:51:27 +00:00
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
Anusha Ragunathan b63495d305 Be more lenient on auplink errors. 
On aufs, auplink is run before the Unmount. Irrespective of the
result, we proceed to issue a Unmount syscall. In which case,
demote erros on auplink to warning.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: dbd9b7e121c2e20e5429fdc97421c9510746161e
Component: engine
 2016-04-06 18:24:19 -07:00
Victor Vieux 64c1d67e0a remove docker info warnings (if any) from Makefile 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b967e381aac05bd309a0ce9eb2f0c46d4a60d8a7
Component: engine
 2016-04-06 16:57:33 -07:00
Victor Vieux 3791d8a070 add make help 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c72b51b09c2a51ef82b00a8ab69002088f2f3249
Component: engine
 2016-04-06 16:57:28 -07: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
Phil Estes 3ff2903f19 Lazy init useradd and remove init() 
This should not have been in init() as it causes these lookups to happen
in all reexecs of the Docker binary. The only time it needs to be
resolved is when a user is added, which is extremely rare.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: c6f45fd2eef00d6dcdcf319400c0c6cd891e9d2a
Component: engine
 2016-04-06 17:53:45 -04: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
Alexander Morozov fd0de04ee0 integration-cli: try to make TestEventsTimestampFormats less flaky 
Fix #21749

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3f358aeaca2bf02ea33e6d487a69f60fff88084c
Component: engine
 2016-04-06 14:31:39 -07: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
Stefan J. Wernli d4ec9845eb Adding readOnly parameter to graphdriver Create method 
Since the layer store was introduced, the level above the graphdriver
now differentiates between read/write and read-only layers.  This
distinction is useful for graphdrivers that need to take special steps
when creating a layer based on whether it is read-only or not.
Adding this parameter allows the graphdrivers to differentiate, which
in the case of the Windows graphdriver, removes our dependence on parsing
the id of the parent for "-init" in order to infer this information.

This will also set the stage for unblocking some of the layer store
unit tests in the next preview build of Windows.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: ef5bfad3210a9e9c8b761f2c11c0c6289490ebff
Component: engine
 2016-04-06 13:52:53 -07:00
Phil Estes 5b67737597 Don't perform external setkey when net==host 
This else case was lost in the migration from native execdriver to OCI
implementation via runc. There is no need to have external setkey when
--net=host.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 1771d35b4852be197c90c19ba5aada940e133c2b
Component: engine
 2016-04-06 16:45:43 -04:00
John Howard 69969b53e0 Windows: Fix failing unit tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ccd0da908ac2b0743ca2c8e80c589295fd3b2563
Component: engine
 2016-04-06 13:42:15 -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