1
0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Commit Graph

26076 Commits

Author SHA1 Message Date
Harald Albers
da8e97fdca Align bash completion of plugins to completion of nodes and services
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: adbb943200209ba668f065b296cec509b0169c53
Component: engine
2016-10-12 05:29:26 -07: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
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
Sebastiaan van Stijn
0110bb5a48 Merge pull request #27232 from bfirsh/godoc-client
Add GoDoc for client package
Upstream-commit: 4331b6271a619dd4c8d5ebfcf4a6122f61df6136
Component: engine
2016-10-10 23:25:34 +02:00
Sebastiaan van Stijn
089158b868 Merge pull request #27252 from startling/more-obsolete-and-gated-by-syscalls
More obsolete and "gated-by"s in docs/security/seccomp.md
Upstream-commit: ef52468fb92344b1596a6a28da4e6df2d6f01c19
Component: engine
2016-10-10 23:16:44 +02:00
Tõnis Tiigi
1ec6d6cfdb Merge pull request #27259 from LK4D4/no_map_pointers
daemon: do not use pointers to map
Upstream-commit: 2945f902bdd090811d840c288bbe7e7072804ea6
Component: engine
2016-10-10 13:15:03 -07:00
Alexander Morozov
aaf0ce0824 daemon: do not use pointers to map
Also, do not shadow err with :=

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 44c280afbf27534dffdbc9c462692e4d2d3cc99a
Component: engine
2016-10-10 11:37:36 -07:00
Aaron Lehmann
35045d026c Merge pull request #27253 from coolljt0725/remove_comment
pkg/archive/changes_posix_test.go: un-comment code line "defer os.RemoveAll(src)"
Upstream-commit: b687712927850d6b6f3fba6e67a717493d5c6c91
Component: engine
2016-10-10 11:36:52 -07:00
Justin Cormack
9893841bd2 Merge pull request #27230 from allencloud/fix-bugs-in-prune
better prune and system df
Upstream-commit: b5cbd84439d212f658a065eda5f7797223853874
Component: engine
2016-10-10 19:30:06 +01:00
Justin Cormack
ec7885ffb8 Add support for ambient capabilities
Linux kernel 4.3 and later supports "ambient capabilities" which are the
only way to pass capabilities to containers running as a non root uid.

Previously there was no way to allow containers not running as root
capabilities in a useful way.

Fix #8460

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 199e19548e93262ab00873c1d761b0d05f866042
Component: engine
2016-10-10 19:29:02 +01:00
Sebastiaan van Stijn
6ae928ce8f Merge pull request #27179 from dragonndev/master
Documentation update for trust sandbox example
Upstream-commit: 4a68c98d70e62db90a6cfe4f3d8d2bfd4aeeb8bc
Component: engine
2016-10-10 19:54:39 +02:00
Kenfe-Mickaël Laventure
78b5fb2443 Merge pull request #27209 from tonistiigi/sleep-between-layers
Fix naivediffdriver timestamp precision bug
Upstream-commit: 7ba31540f0ec4e36608160421172e03f92815336
Component: engine
2016-10-10 10:24:49 -07:00
Tibor Vass
a92d57e7db Merge pull request #26719 from AkihiroSuda/fix-race-builder-vs-container-1
Fix a race found in TestBuildCancellationKillsSleep
Upstream-commit: f5f0b77cec3d05f9f9f3ec618693030166fb1aa0
Component: engine
2016-10-10 18:54:55 +02:00
allencloud
5f64850ff1 better prune and system df
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: fd62b6c9505451670b926216648ab7f6a3f9f586
Component: engine
2016-10-11 00:42:21 +08:00
Sebastiaan van Stijn
1c78e3518f Merge pull request #26778 from WeiZhang555/parallel-operations
Support parallel kill,rm
Upstream-commit: 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
Component: engine
2016-10-10 18:31:10 +02:00
yuexiao-wang
216da195bc Add the OPTIONS and Fix the links for contain prune
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6396c62fdc5355ff097da6a131cb176a5f521470
Component: engine
2016-10-11 00:13:33 +08:00
Lei Jitang
e0f35ce34e pkg/archive/changes_posix_test.go: un-comment code line "defer os.RemoveAll(src)"
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 6514299fa9b716adbb04e67be583a335cd123398
Component: engine
2016-10-10 05:23:24 -04:00
Lizzie Dixon
4ad7cdfc6a More obsolete and "gated-by"s in docs/security/seccomp.md
Have used "obsolete" is "pre-2.6".

These are all sourced from the manpages.

Signed-off-by: Lizzie Dixon <_@lizzie.io>
Upstream-commit: 7e84a1aebd4807f8f6a370fa49662311bed68ce9
Component: engine
2016-10-10 01:55:56 -07:00
Ben Firshman
c2e67963cd Add GoDoc for client package
- Tightened up copy in README
- Make example in README a bit simpler
- Update README to point at GoDoc

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 070038bbc720192338850ff714459fbd5e633853
Component: engine
2016-10-10 09:27:07 +01:00
yuexiao-wang
6453548dcb Fix the incorrect links
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4b61b18ed2a137eaa27d76e0c57b7fe8f6600172
Component: engine
2016-10-10 23:26:05 +08:00
Deng Guangxing
7c290e5ed5 fix typo in client/errors.go comments
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: a68ba6be5d5e3341bb1deca52329d1a8aa6c024d
Component: engine
2016-10-08 15:29:32 +08:00
Tonis Tiigi
f43049507b Fix naivediffdriver timestamp precision bug
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d1a83059f700ea7a15a4f17f4ed833f023ec3398
Component: engine
2016-10-07 13:52:17 -07:00
Alexander Morozov
5b765cef2d Merge pull request #27169 from tonistiigi/move-restartmanager
move restartmanager out of libcontainerd
Upstream-commit: 058556d7fc0e7b33f53523069e796ccf1e22229f
Component: engine
2016-10-07 13:41:12 -07:00
Alexander Morozov
dad56b9c8e Merge pull request #27221 from crosbymichael/update-init
Update grimes to 15ecf9414859b16a8a19ac6748a622a5498d57e3
Upstream-commit: 390a82c3fa5ceca4d01eb1baf64e3f4fdae6535d
Component: engine
2016-10-07 13:22:44 -07:00
Tonis Tiigi
6363780a38 Remove restartmanager from plugins
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a452d1fccb6d515545dacd4bebfa36cbf70a6535
Component: engine
2016-10-07 12:10:13 -07:00
Tonis Tiigi
97516856c4 Remove restartmanager from libcontainerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 606a245d8548e98e889df1b9cf511b5953a309b9
Component: engine
2016-10-07 12:09:54 -07:00
Michael Crosby
ea330f084a Update grimes to 15ecf9414859b16a8a19ac6748a622a5498d57e3
This fixes an issue when wait4 returns a 0 return status causing the
reaping loop to continue to run.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c27116575e0d9b0d1eb085cffef0693babb7bdbb
Component: engine
2016-10-07 12:06:42 -07:00
Vincent Demeester
dca3d10db4 Merge pull request #26996 from Microsoft/jjh/imageinspectosversion
(Windows) Inspect image populate OSVersion
Upstream-commit: febf53d91a43fe13fbb802d9e6b7b6732183cf21
Component: engine
2016-10-07 18:33:01 +02:00
Vincent Demeester
d1b375bf46 Merge pull request #23389 from Microsoft/jjh/credentialspec
Windows: Support credential specs
Upstream-commit: b3cc3d7bf9606b64833d5596fee84bff416652c3
Component: engine
2016-10-07 18:32:44 +02:00
Vincent Demeester
ae6ecc60f9 Merge pull request #27171 from tonistiigi/improve-attach-closed
Improve TestAttachClosedOnContainerStop
Upstream-commit: e42ec6d7cb6090b3bc0b490d86961e780942caef
Component: engine
2016-10-07 11:26:33 +02:00
Vincent Demeester
6be324c5f4 Merge pull request #26882 from runcom/proxy-path
Specify userland proxy path
Upstream-commit: 91312f71aabe4f0840060049259fc6dbfcc62cd2
Component: engine
2016-10-07 09:44:39 +02:00
Brian Goff
39706ac8f3 Merge pull request #27206 from darrenstahlmsft/MoreWindowsTests
Enabled more test on Windows, API and Build
Upstream-commit: 323f8ceffd3110077144f16ad61fc03884f29df1
Component: engine
2016-10-07 08:57:40 +02:00
Darren Stahl
b38cf86690 Enabled more test on Windows, API and Build
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 6482410c9d708d0979aedfc65c156eba835cefb3
Component: engine
2016-10-06 17:18:42 -07:00
Victor Vieux
21c16cc44b Merge pull request #27184 from tiborvass/gnupg-debian-stretch
install: fix debian stretch
Upstream-commit: 2fd674a00f98469caa1ceb572e5ae92a68b52f44
Component: engine
2016-10-06 14:20:03 -07:00
Tibor Vass
8f09fdc161 install: fix debian stretch
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 047264763adb3f61b1470b97e9fa20a4f1ddc83d
Component: engine
2016-10-06 22:23:08 +02:00
John Howard
e61236d868 Inspect populate image OSVersion
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b7f537e811d40244c76da93319e3f6f30c4c88e3
Component: engine
2016-10-06 11:46:24 -07:00
Justin Cormack
9ad2ffa17a Merge pull request #27160 from mlaventure/update-containerd
Update containerd and runc
Upstream-commit: 5ee2c2a6475056f55327ce77b61677499a9e3fa8
Component: engine
2016-10-06 19:36:31 +02:00
John Howard
75a301f015 Windows: Support credential specs
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e85867cb68cc28208c91bb43fc5cdcff824c468e
Component: engine
2016-10-06 09:32:22 -07:00
Brian Goff
9f9ffdba55 Merge pull request #27170 from fivestars/26991-consolez
Force input stream ANSI emulation for ConsoleZ
Upstream-commit: 28cca5dcaa2aa21123805d7f2d51916ea1f38d71
Component: engine
2016-10-06 17:37:16 +02:00
John Howard
f0a774aa4a Merge pull request #26926 from darrenstahlmsft/RevendorHcshim
Revendor hcsshim to v0.5.1
Upstream-commit: efa82c6561f991e108e2d7e3b5d012a886a2e6a9
Component: engine
2016-10-06 08:35:37 -07:00
Antonio Murdaca
b79ddee1da daemon: add --userland-proxy-path flag
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dd2e1947dc58d6807a5ddc401f84184fc5a77c2a
Component: engine
2016-10-06 17:31:53 +02:00
Brian Goff
a4c533dd30 Merge pull request #27167 from Microsoft/jjh/blockexport
Windows: export not supported
Upstream-commit: f19120c305de68b1af5062479c19894fc85ecbb3
Component: engine
2016-10-06 16:05:36 +02:00
Brian Goff
1ec9df3e63 Merge pull request #27183 from darrenstahlmsft/BuildTests
Enable more build tests on Windows
Upstream-commit: 48a75f6493697c4f0cbd44f1c83e04f5475c921e
Component: engine
2016-10-06 15:52:45 +02:00
Sebastiaan van Stijn
384b4fc67f Merge pull request #26797 from srodman7689/friendly_error_on_permissions_connection_error
Closes #26761 Updated the client/request.go sendClientRequest method to return a Pe…
Upstream-commit: 16a45dba89c0e024e87371725bb73e01cf49229a
Component: engine
2016-10-06 14:13:41 +02:00
Vincent Demeester
01d37a68e4 Merge pull request #27181 from sdurrheimer/zsh-completion-daemon-init-path
Add zsh completion for 'dockerd --init-path'
Upstream-commit: 2160953d26b536e9abe76869649e93ecc7550477
Component: engine
2016-10-06 10:58:21 +02:00
Darren Stahl
49c4720cde Enable more build tests on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 443d7313f5fd23dd7fac7fe8ec70c9a8afdb9d9e
Component: engine
2016-10-06 00:53:30 -07:00
Sebastiaan van Stijn
bc391d53f3 Update reviewing process for unified docs repo
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 306912eb92ef381f98f3ca957d28c56a56d258f8
Component: engine
2016-10-06 09:35:22 +02:00
Steve Durrheimer
ccf5d6bcd1 Add zsh completion for 'dockerd --init-path'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 3db52223402145e3e83d478d827abf5cfa20e981
Component: engine
2016-10-06 07:38:39 +02:00
Matthew Lapworth
6dba2ad111 Fixed issue when running trust example where the notary server tag wasn't found.
Signed-off-by: Matthew Lapworth <matthewl@bit-shift.net>
Upstream-commit: 0a43c5fedb4c74803858cfdacd59eca3c7376f18
Component: engine
2016-10-05 21:05:17 -07:00
Tonis Tiigi
c12d0e0fa9 Improve TestAttachClosedOnContainerStop
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9d8f01b4f5ce3fe20c3116a486006a3e01f59fc5
Component: engine
2016-10-05 15:52:09 -07:00