docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
23,920 Commits 12 Branches 297 Tags
8e3735bee607504dd36ed1d58e89e8a9c2bca5cf
Commit Graph

22406 Commits

Author SHA1 Message Date
Alexander Morozov
8e3735bee6 Merge pull request #22361 from duglin/removeCR 
Remain extra \n on INFO log msg
Upstream-commit: 1158c921ab49793d87fc35e15eff23434822d6ab
Component: engine
 2016-04-27 12:05:10 -07:00
moxiegirl
7b8da9de87 Merge pull request #22229 from riyazdf/notary-doc-update 
Update DCT docs with 1.11 info, fix typos
Upstream-commit: 861815a3252b88a118a91a164246401fa24fa549
Component: engine
 2016-04-27 09:59:30 -07:00
Riyaz Faizullabhoy
e27d461e96 Update DCT docs with 1.11 info, fix typos 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 77da3bcb72ba4f936c428cb2b912c007a94cb87a
Component: engine
 2016-04-27 09:57:54 -07:00
Doug Davis
f770cdfb66 Remain extra \n on INFO log msg 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1e44bba4af6c417e10cbf7aa459a8225dfb89d6c
Component: engine
 2016-04-27 05:19:40 -07:00
Kai Qiang Wu(Kennan)
ff027b364b Add load/save image event support 
For every docker load and save operations, it would log related
image events.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 06561057103441fe176910e12674d998b8561b75
Component: engine
 2016-04-27 01:11:03 +00:00
Brian Goff
8a812459dd Merge pull request #22329 from runcom/fix-tmpfs-order 
daemon: reorder mounts before setting them
Upstream-commit: 0147164cfd0645849f2464edb2c64c601a3ab492
Component: engine
 2016-04-26 20:23:13 -04:00
Michael Crosby
7cba2b7aed Merge pull request #22181 from Microsoft/jjh/workdir 
Windows: Consistent build workdir handling
Upstream-commit: 2b97201e0cd8301484fde379d2bf7f0ad3f36f10
Component: engine
 2016-04-26 16:51:09 -07:00
John Howard
b630bbc615 Merge pull request #21384 from Microsoft/10662-IOResourceControls 
Add IO Resource Controls for Windows
Upstream-commit: a8c5ba75172686a2be2119a3b46c6acda02f0a36
Component: engine
 2016-04-26 15:54:52 -07:00
John Howard
51ef85c587 Windows: Consistent build workdir handling 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0433801093f1988db0e210e28352f4af71a0ac81
Component: engine
 2016-04-26 15:32:52 -07:00
Brian Goff
421a9caea1 Merge pull request #22324 from WeiZhang555/fix-test-case 
Fix test case
Upstream-commit: 4925fcbe2e5db8e44d48af0ec12b2badb7af1752
Component: engine
 2016-04-26 15:01:02 -04:00
Alexander Morozov
a7df8827dc Merge pull request #22276 from Microsoft/jjh/dockerd 
Move docker and dockerd main packages in directories with same name, under `cmd/`
Upstream-commit: d3d591c5365d22037cb884bae4ac269dd4da28b2
Component: engine
 2016-04-26 11:24:01 -07:00
Sebastiaan van Stijn
470595a333 Merge pull request #22291 from thaJeztah/update-template-for-changelog 
pull-request template: ask for changelog description
Upstream-commit: 1f72e46095cca6850d00af0bca736fdf26176a03
Component: engine
 2016-04-26 18:51:31 +02:00
John Howard
7882678c17 Make dockerd debuggable 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0c7eab31577d65f0d33766af533144e358ffe651
Component: engine
 2016-04-26 09:35:22 -07:00
Vincent Demeester
3d056fb569 Merge pull request #22308 from tianon/dockerd-consistency 
Tweak hack/make/*-{client,daemon} to be consistent
Upstream-commit: dc7664d62e4e758ba1a532dca578f53880faa388
Component: engine
 2016-04-26 15:32:06 +02:00
Zhang Wei
c44b17ce8b Fix test case 
"TestRestartContainerwithRestartPolicy" contains some codes that could be
flaky, it's supposed to be fixed in #22256.

This commit removes unnecessary code, make the test case cleaner.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: a7eecd2b61296825f9a0f739dbc06ad65a3d2c5d
Component: engine
 2016-04-26 19:22:48 +08:00
Vincent Demeester
97d052a355 Merge pull request #22328 from HackToday/fixcomment 
Fix wrong comment
Upstream-commit: 6b91fd1a91bbb3148c505be9fa72d201f2ef56c9
Component: engine
 2016-04-26 13:00:38 +02:00
Sebastiaan van Stijn
470f56b334 Merge pull request #22331 from SvenDowideit/minor-api-formating-change 
Small API formating fix.
Upstream-commit: 3f7b6754ca11cbb5a34bc54c8878df04719e5aee
Component: engine
 2016-04-26 12:46:25 +02:00
Sven Dowideit
21117de54d Small API formating fix. 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 204a52c689204a4d9506d500955673f7b5361d1d
Component: engine
 2016-04-26 10:29:31 +00:00
Sebastiaan van Stijn
b8a4ac98f2 pull-request template: ask for changelog description 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb59238d17ac63dcc598980044033f79052b5fa7
Component: engine
 2016-04-26 12:26:14 +02:00
Antonio Murdaca
64c17a1eca daemon: reorder mounts before setting them 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 6a8ea46c67c3594118c7da41b1cebe062aff3f6a
Component: engine
 2016-04-26 11:03:25 +02:00
Kai Qiang Wu(Kennan)
37c9f27500 Fix wrong comment 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 718eba88363c14065b3a2a2dfbc9f270fc7cf63e
Component: engine
 2016-04-26 07:36:14 +00:00
Vincent Demeester
7239ebb0f7 Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm 
Windows: revendor Azure/go-ansiterm
Upstream-commit: dc98cb534e1ac2375112db56f5c98dd08010c4dc
Component: engine
 2016-04-26 08:19:47 +02:00
John Howard
b0763649ac Merge pull request #22275 from Microsoft/jstarks/no_rsrc 
Windows: Add file version information
Upstream-commit: 78895c92c2baab420ae73322cc3d15009efa221e
Component: engine
 2016-04-25 20:53:19 -07:00
Brian Goff
3500c1d298 Merge pull request #22318 from mrunalp/mount_label_fix 
Fix mount label
Upstream-commit: e2c40555f76c0fddff8e17f7930ad90d4cf375b8
Component: engine
 2016-04-25 19:54:32 -04:00
John Starks
db3db29c9f Windows: revendor Azure/go-ansiterm 
go-ansiterm was previously pulling the testing package into the docker
binaries.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: fab67ab677e14c908f879e362f8805c8e91570c6
Component: engine
 2016-04-25 15:57:59 -07:00
John Howard
313ee5d51f Merge pull request #22055 from Microsoft/sjw/servicing 
Adding servicing update to postRunProcessing for Windows containers.
Upstream-commit: 66ebc34235f32fdb37dcc9b859037944f3790bbd
Component: engine
 2016-04-25 15:20:23 -07:00
Mrunal Patel
3ee9fe57f8 Update runc and spec dependencies for mount label 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Set up the mount label in the spec for a container

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: e0f98c698b49e3790fe63bff611eeda6f5b46055
Component: engine
 2016-04-25 14:26:49 -07:00
Alexander Morozov
b26c916d3b Merge pull request #22306 from thaJeztah/update-integration-test-network-only 
skip TestAuthApi if no network is available
Upstream-commit: 1b4286f40de1237ef96f9e953a6a8c2f050b8421
Component: engine
 2016-04-25 14:02:26 -07:00
Darren Stahl
87afb49f07 Add IO Resource Controls for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 8df2066341931d9b7ba552afa902e2ef12e5eed5
Component: engine
 2016-04-25 13:07:29 -07:00
Stefan J. Wernli
452a7d0ba9 Adding servicing update to postRunProcessing for Windows containers. 
This change enables the workflow of finishing installing Windows OS updates in the container after it has completed running, via a special servicing container.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: da92dad59f76421a22a955d2aed25bfeb4562385
Component: engine
 2016-04-25 12:16:26 -07:00
Tianon Gravi
d2c52f7016 Tweak hack/make/*-{client,daemon} to be consistent 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 626d25a7d94aa05427ecb85ba73bad1e8738c57b
Component: engine
 2016-04-25 11:40:36 -07:00
Tibor Vass
bdb0102fb8 Merge pull request #22303 from kencochrane/fix_integration_daemon_start 
Fixing the PATH in .integration-daemon-start to find dyn docker binary
Upstream-commit: e974eadd949c5d7cb91a7d4406c2e0da8b1db677
Component: engine
 2016-04-25 14:39:45 -04:00
Tibor Vass
390a620078 Merge pull request #22301 from kencochrane/dynbinary-fix 
Change name from docker-client to docker in dynbinary-client
Upstream-commit: 5611424d82c6cebd134c83ba99bb4ccb72703317
Component: engine
 2016-04-25 14:38:13 -04:00
Alexander Morozov
4428336660 Merge pull request #22230 from justincormack/seccomp_dropcalls 
Remove mlock and vhangup from the default seccomp profile
Upstream-commit: 48f25161be64b98d9d38f3dbe1fe7873e7149b78
Component: engine
 2016-04-25 11:27:42 -07:00
Sebastiaan van Stijn
6ee8d84c70 skip TestAuthApi if no network is available 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2fae3d2693648d1c0f5cc079f37aaba5116ba5f9
Component: engine
 2016-04-25 20:12:36 +02:00
Vincent Demeester
e49ce8b3dd Merge pull request #22125 from crosbymichael/restart-timeout 
Reset restart timeout if execution longer than 10s
Upstream-commit: 17d5c97c900d90bee7a1ba4182bf9ea51e5c386d
Component: engine
 2016-04-25 19:15:32 +02:00
Aaron Lehmann
3e2f49ebeb Merge pull request #22254 from yongtang/22244-remote-api-auth-behavior 
Add default `serveraddress` value in remote API `/auth`
Upstream-commit: e6df098390b286abb40a87b2cb13228a6aebdf79
Component: engine
 2016-04-25 10:15:08 -07:00
Vincent Demeester
fa4887efcd Merge pull request #22272 from yongtang/22271-relative-symlinks 
Relative symlinks don't work with --device argument
Upstream-commit: 88d1ae148cb27cb685e1d6abf631d48bf3bf7408
Component: engine
 2016-04-25 18:10:04 +02:00
David Calavera
9da69f2589 Merge pull request #21583 from allencloud/move-cors-into-common-config 
move cors into common config
Upstream-commit: 28b7dc51aec6a237af187badfc1953eb9dbbb142
Component: engine
 2016-04-25 09:08:38 -07:00
Tibor Vass
8373ef7283 Merge pull request #22299 from thaJeztah/fix-label-reload 
fix reloading of daemon labels from config
Upstream-commit: bee093802d0310c1e34a3b5fcd9c37ea16cd38f9
Component: engine
 2016-04-25 12:06:57 -04:00
David Calavera
5920e5f694 Merge pull request #22265 from thaJeztah/ohman-ohman 
OHMAN! Move vbatts to alumni
Upstream-commit: 0843527e869ebeeb1e0c43f5487af3c75d0a6187
Component: engine
 2016-04-25 09:05:09 -07:00
Doug Davis
773053356a Merge pull request #22118 from michael-holzheu/22007-s390x-fix-notary-build-for-gcc-v2 
Create "src" symlink for building notary with gcc 5
Upstream-commit: d03ba27b76a5dee1d4e6306c66e6e842f41275fa
Component: engine
 2016-04-25 11:50:00 -04:00
Ken Cochrane
c3c0a0ed24 Fixing the PATH in .integration-daemon-start to find dynamic docker binary 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 5ee737c70c7b8f7a0a915ca048538ee12cf1d737
Component: engine
 2016-04-25 11:18:34 -04:00
Ken Cochrane
33e8b136d5 Change name from docker-client to docker in dynbinary-client 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: f9e03d52e9b4b80cf869f0c279278dcb8340f585
Component: engine
 2016-04-25 10:44:37 -04:00
Yong Tang
4ee918032b Relative symlinks don't work with --device argument 
This fix tries to address the issue raised in #22271 where
relative symlinks don't work with --device argument.

Previously, the symlinks in --device was implemneted (#20684)
with `os.Readlink()` which does not resolve if the linked
target is a relative path. In this fix, `filepath.EvalSymlinks()`
has been used which will reolve correctly with relative
paths.

An additional test case has been added to the existing
`TestRunDeviceSymlink` to cover changes in this fix.

This fix is related to #13840 and #20684, #22271.
This fix fixes #22271.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 632b314b239d1cd5e2498f198503a2983233a9f4
Component: engine
 2016-04-25 07:22:56 -07:00
Sebastiaan van Stijn
f5d8c4ece5 Merge pull request #22294 from allencloud/fix-Insecure-registries-uppercase-in-docker-info 
Fix insecure registries upppercase in docker info
Upstream-commit: e8708f30490cf09e76b5df4f1a675387eb6b1c07
Component: engine
 2016-04-25 16:21:04 +02:00
Sebastiaan van Stijn
ee29c9c4b3 fix reloading of daemon labels from config 
commit 20a038eca68e4188e1cd812293aea8cb220cf08f changed
daemon configuration reloading to check if a value
was actually set, however, it checked for the wrong
property ("label" instead of "labels"), which resulted
in the labels only to be loaded from daemon.json if both
a "label" -and- a "labels" property was present.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 455858fc70e3b752fb2495bbdda368613e6587c2
Component: engine
 2016-04-25 15:57:28 +02:00
Lei Jitang
62d05d12a1 Merge pull request #22287 from hqhq/hq_add_blk_check 
Add CONFIG_CFQ_GROUP_IOSCHED check
Upstream-commit: 66eb91463a2c2400a4bc059144283509e09e209b
Component: engine
 2016-04-25 20:15:31 +08:00
allencloud
860fb4199d make Insecure registries uppercase like other keys in docker info 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: e78884dafd2e9f5378626c4699c6b3b713eecf03
Component: engine
 2016-04-25 18:44:34 +08:00
Qiang Huang
e0fe841732 Add CONFIG_CFQ_GROUP_IOSCHED check 
blkio.weight depends on this config.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 192387198d02e3e75377f8fbc06840b9a6dec8bd
Component: engine
 2016-04-25 14:08:29 +08:00