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
23,581 Commits 12 Branches 296 Tags
fc44672a2f125dc6b67321fdb87055f91c4b2340
Commit Graph

23581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester
fc44672a2f Merge pull request #21878 from TrumanLing/fix_typo 
fix typo
Upstream-commit: fb9523442da7da497ee29db63d0ae2591c0cfa1a
Component: engine
 2016-04-08 11:19:52 +02:00
LingFaKe
c71898566b fix typo 
Signed-off-by: Ling FaKe <lingfake@huawei.com>
Upstream-commit: d0344731ef11a5951c86f444ac40e27f2472db01
Component: engine
 2016-04-08 22:08:58 +08:00
John Howard
f61a32826f Merge pull request #21872 from Microsoft/sjw/nanoserver-fix 
Fixing nanoserver image load bug.
Upstream-commit: d5ef62f4895206abd4ab2b5e61a49a59d37d1ecf
Component: engine
 2016-04-07 21:24:32 -07:00
Sebastiaan van Stijn
53e7dea4ac Merge pull request #21874 from Hyzhou/master 
Fix the docker image --no-trunk output format
Upstream-commit: 6ad89f4d2fdf5b0c176479f990f02c3676dc44b0
Component: engine
 2016-04-07 20:37:14 -07:00
John Howard
088a8da7f5 Merge pull request #21774 from Microsoft/jstarks/support_non_base_layered_images 
Windows: support non-base-layered images
Upstream-commit: fdd5b5de6290f351a91b80f4e6634fbb87862776
Component: engine
 2016-04-07 20:13:38 -07:00
Brian Goff
b2fd28f517 Merge pull request #21863 from LK4D4/narrow_interface 
pkg/archive: use more narrow interface for CompressStream
Upstream-commit: 64f10251bd034e1b2bd1c4d5f07ee633b4fcced8
Component: engine
 2016-04-07 22:35:19 -04:00
Brian Goff
30ee59a24a Merge pull request #21867 from calavera/remove_reference_from_api 
Remove reference package dependency from the api.
Upstream-commit: 681b5e0ed45f535d123d997884ce4ffb2907932f
Component: engine
 2016-04-07 21:56:43 -04:00
Brian Goff
fd446e3c8a Merge pull request #21815 from Microsoft/jjh/fixunittest 
Windows: Fix failing unit tests
Upstream-commit: 3e14070c880dc1f3d9ca81c55f84ccebe8d89ad2
Component: engine
 2016-04-07 21:14:42 -04:00
Hyzhou
55523d36c7 Fix the docker image --no-trunk output format 
docker 1.10 change the output format of image id.

Signed-off-by: hyzhou.zhy <hyzhou.zhy@alibaba-inc.com>
Upstream-commit: b83e9df7609e705a85545a8a63db81ef73d85b0e
Component: engine
 2016-04-08 08:59:59 +08:00
Brian Goff
9e5a9af85e Merge pull request #21871 from tonistiigi/fix-restartpolicy-on-restart 
Fix restart monitor stopping on manual restart
Upstream-commit: 0c4f28e51a45bdc21ba9fa1630bdf52c944778eb
Component: engine
 2016-04-07 20:56:33 -04:00
John Starks
e3b16ea4f7 Windows: Support ApplyDiff on a base layer 
This adds support to the Windows graph driver for ApplyDiff on a base
layer. It also adds support for hard links, which are needed because the
Windows base layers double in size without hard link support.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: cf7944bf6f64c844b74ad937a79d66dafaf99673
Component: engine
 2016-04-07 17:52:28 -07:00
John Starks
91f3e13e7c Windows: revendor Microsoft/go-winio and Microsoft/hcsshim 
These changes add support for importing base layers and change the tar
metadata for Windows layers to better match the intent of the tar format.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 9b486999f280c1a5a283a0bbe80ae0991e82ced7
Component: engine
 2016-04-07 17:52:27 -07:00
John Starks
cfe0e7d529 Windows: Support non-base-layered images 
Previously, Windows only supported running with a OS-managed base image.
With this change, Windows supports normal, Linux-like layered images, too.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: d45a26d7e24719814bc321db6fa173110af30740
Component: engine
 2016-04-07 17:52:26 -07:00
Sebastiaan van Stijn
048b376d5a Merge pull request #21816 from estesp/case-of-the-missing-else 
Don't perform external setkey when net==host
Upstream-commit: fc352287c17cb044dca49b253dee9050748535ad
Component: engine
 2016-04-07 17:01:30 -07:00
Stefan J. Wernli
431366980d Fixing nanoserver image load bug. 
Fixes an issue that prevents nano server images from loading properly. Also updates logic for custom image loading to avoid preventing daemon start because an image failed to load.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: a22092b13695c44790bb443ac8b536965b1cdba3
Component: engine
 2016-04-07 16:44:51 -07:00
Tonis Tiigi
3b340912c5 Fix restart monitor stopping on manual restart 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 20390f65c487cfbe18e1f21650086a00e41eadff
Component: engine
 2016-04-07 16:12:05 -07:00
David Calavera
956e3c675e Remove reference package dependency from the api. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 47afe6bd0a0dc806c36d0978a8d3e23f75ef87fe
Component: engine
 2016-04-07 15:01:23 -07:00
Sebastiaan van Stijn
ecdfed949e Merge pull request #21750 from LK4D4/flaky_format_test 
integration-cli: try to make TestEventsTimestampFormats less flaky
Upstream-commit: 14015eedb16c11b2f7e7a0b5ca45e78d24d34c7a
Component: engine
 2016-04-07 13:42:17 -07:00
Vincent Demeester
069b2b7c5b Merge pull request #21859 from tonistiigi/vendor-net-fork 
vendor: patch template init in trace pkg for performance
Upstream-commit: 14aa019d2de3bd7f21d29d920bd074015a0e7d8d
Component: engine
 2016-04-07 22:39:23 +02:00
Alexander Morozov
ffc19b3fb1 pkg/archive: use more narrow interface for CompressStream 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9b2c3aa8946eee15e5938f03c2202b16a7f22875
Component: engine
 2016-04-07 13:21:05 -07:00
Vincent Demeester
c81691ebc7 Merge pull request #21806 from Microsoft/RemoveSymlinkTests 
Stop running symlink-volume tests on Windows
Upstream-commit: 07f580489908bf6a3373daac1473045406e1130d
Component: engine
 2016-04-07 22:03:44 +02:00
Tonis Tiigi
ef51d8c512 vendor: patch template init in trace pkg for performance 
Temporarily include a fork of golang/net package
that includes a performance patch. Measured performance
gain is ~60ms for every `docker run` command.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 07fe6947a403124041dda50eb6d7f00e74f96ce7
Component: engine
 2016-04-07 11:02:14 -07:00
Jess Frazelle
ce5759e885 Merge pull request #21855 from vdemeester/makefile-typo 
Fixing a typo in Makefile
Upstream-commit: 1fbdd354c2df5cebf981fcd6afe1355fbb040fd8
Component: engine
 2016-04-07 16:41:25 +00:00
Tibor Vass
32c33f154c Merge pull request #21628 from clnperez/systemd-tasksmax-workaround 
Build-deb hack for systemd tasksmax
Upstream-commit: e82830ecde02b3a607d5f3b470f2c4eff17c37e7
Component: engine
 2016-04-07 12:30:45 -04:00
Christy Perez
0b7d02b0d9 Build-deb hack for systemd tasksmax 
Since we can't use the TasksMax value in the docker.service
file by default, we can uncomment it at buildtime.

See docker/docker/pull/21491 for some background.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 2b849e0263576a818fafd73ba0467633db3bb6cb
Component: engine
 2016-04-07 11:08:30 -05:00
Brian Goff
a30f33e6a5 Merge pull request #21840 from tonistiigi/fix-closing-attach-streams 
Fix closing attach streams on lost tcp connection
Upstream-commit: 4f8a6f3e02135ade04d31b493ed08af4b308b9e0
Component: engine
 2016-04-07 12:02:33 -04:00
Vincent Demeester
0038ff8590 Fixing a typo in Makefile 
A typo is present in the new awesome `make help`, fixing that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3785844c5bdd57ded9a6410579e3a356b126c26e
Component: engine
 2016-04-07 16:10:09 +02:00
Vincent Demeester
82647f4d8c Merge pull request #21820 from estesp/lazy-init-useradd 
Lazy init useradd and remove init()
Upstream-commit: d5dfc4e5262a56181b2203c3fb6474ebe3a4ae92
Component: engine
 2016-04-07 10:09:02 +02:00
Vincent Demeester
742837d4b6 Merge pull request #21828 from dmcgowan/fix-overlay-on-overlay-test 
Fix overlay test running on overlay
Upstream-commit: 2e236d0255bd6f4f5f37c2512f89b22655d47d1f
Component: engine
 2016-04-07 10:07:25 +02:00
Vincent Demeester
693053b90a Merge pull request #21842 from tonistiigi/fix-flaky-testsaveloadparents 
Fix flaky TestSaveLoadParents
Upstream-commit: 334f73f5b4162ffc3bfb5a07323c83e732bfbfa6
Component: engine
 2016-04-07 10:01:28 +02:00
Vincent Demeester
24e68a306f Merge pull request #21835 from HackToday/fixsecurity 
Fix deprecated format for security-opt
Upstream-commit: 36bc01c0cb6ff48b70aad17231d8561bc418096f
Component: engine
 2016-04-07 09:28:58 +02:00
Vincent Demeester
63950888d2 Merge pull request #21830 from anusha-ragunathan/auplink 
Be more lenient on auplink errors.
Upstream-commit: 8785952282a444358e934678b3833be935340259
Component: engine
 2016-04-07 09:19:38 +02:00
Vincent Demeester
8c076e20e1 Merge pull request #21841 from WeiZhang555/error-typo 
Fix typo
Upstream-commit: d7a04c741693295f4ee708bb3504a48bbbf824db
Component: engine
 2016-04-07 08:56:43 +02:00
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
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