Commit graph

27803 commits

Author SHA1 Message Date
Sebastiaan van Stijn
c98571b8f8 Merge pull request #26565 from justincormack/pinata-bundle
Add a script to install a bundle into Docker for Mac
2016-10-11 16:17:49 +02:00
Sebastiaan van Stijn
45d3462914 Merge pull request #26782 from cdrage/add-nat-check-to-script
Add check for CONFIG_IP_NF_NAT to kernel check
2016-10-11 15:14:53 +02:00
Madhu Venugopal
5ff17cb4aa Merge pull request #26954 from mrjana/net
Vendoring libnetwork @7b74403
2016-10-11 05:59:35 -07:00
Sebastiaan van Stijn
f7d1682c60 Merge pull request #26896 from jmzwcn/issue26244
Fix issue26244:swarm service, with overlay network, fails to remove all containers
2016-10-11 14:40:39 +02:00
Vincent Demeester
6b997739fe Merge pull request #26970 from wzhliang/restart-stopped-container
zsh: allow restarting stopped containers by id
2016-10-11 14:37:54 +02:00
Sebastiaan van Stijn
f65bf11e26 Merge pull request #26894 from thaJeztah/improve-log-level-help
Improve --log-level help text
2016-10-11 12:35:42 +02:00
Justin Cormack
d316e172da Merge pull request #26690 from mwhudson/ignore-oom_score_adj-failure
Ignore failure to set oom_score_adj, as happens in an unprivileged container.
2016-10-11 10:01:22 +01:00
Madhu Venugopal
9a570f8d80 Merge pull request #27265 from Microsoft/jjh/gowinio035
Windows: Update go-winio to 0.3.5
2016-10-10 18:11:28 -07:00
John Howard
97ac469934 Windows: Update go-winio to 0.3.5
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-10 15:08:17 -07:00
Jana Radhakrishnan
83ba14a552 Vendoring libnetwork @7b74403be424
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-10 14:39:02 -07:00
Sebastiaan van Stijn
4331b6271a Merge pull request #27232 from bfirsh/godoc-client
Add GoDoc for client package
2016-10-10 23:25:34 +02:00
Sebastiaan van Stijn
ef52468fb9 Merge pull request #27252 from startling/more-obsolete-and-gated-by-syscalls
More obsolete and "gated-by"s in docs/security/seccomp.md
2016-10-10 23:16:44 +02:00
Sebastiaan van Stijn
3197b312d0 Improve --log-level help text
This information was added in
1efc940e6f,
but removed again in
a271eaeba2
to make the help-output fit in a 80-chars
terminal.

This adds the available options again
in the help output, and updates the CLI
reference documentation to match actual
output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-10 23:10:17 +02:00
Tõnis Tiigi
2945f902bd Merge pull request #27259 from LK4D4/no_map_pointers
daemon: do not use pointers to map
2016-10-10 13:15:03 -07:00
Alexander Morozov
44c280afbf daemon: do not use pointers to map
Also, do not shadow err with :=

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-10-10 11:37:36 -07:00
Aaron Lehmann
b687712927 Merge pull request #27253 from coolljt0725/remove_comment
pkg/archive/changes_posix_test.go: un-comment code line "defer os.RemoveAll(src)"
2016-10-10 11:36:52 -07:00
Justin Cormack
b5cbd84439 Merge pull request #27230 from allencloud/fix-bugs-in-prune
better prune and system df
2016-10-10 19:30:06 +01:00
Justin Cormack
199e19548e 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>
2016-10-10 19:29:02 +01:00
Sebastiaan van Stijn
4a68c98d70 Merge pull request #27179 from dragonndev/master
Documentation update for trust sandbox example
2016-10-10 19:54:39 +02:00
Kenfe-Mickaël Laventure
7ba31540f0 Merge pull request #27209 from tonistiigi/sleep-between-layers
Fix naivediffdriver timestamp precision bug
2016-10-10 10:24:49 -07:00
Tibor Vass
f5f0b77cec Merge pull request #26719 from AkihiroSuda/fix-race-builder-vs-container-1
Fix a race found in TestBuildCancellationKillsSleep
2016-10-10 18:54:55 +02:00
allencloud
fd62b6c950 better prune and system df
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-11 00:42:21 +08:00
Sebastiaan van Stijn
2f12d28084 Merge pull request #26778 from WeiZhang555/parallel-operations
Support parallel kill,rm
2016-10-10 18:31:10 +02:00
Vincent Demeester
9115b65ffd Merge pull request #27249 from yuexiao-wang/container-prune
Add the OPTIONS and Fix the links for prune
2016-10-10 17:02:10 +02:00
yuexiao-wang
6396c62fdc Add the OPTIONS and Fix the links for contain prune
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-11 00:13:33 +08:00
Lei Jitang
6514299fa9 pkg/archive/changes_posix_test.go: un-comment code line "defer os.RemoveAll(src)"
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-10-10 05:23:24 -04:00
Lizzie Dixon
7e84a1aebd
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>
2016-10-10 01:55:56 -07:00
Ben Firshman
070038bbc7
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>
2016-10-10 09:27:07 +01:00
Lei Jitang
bac97fa059 Merge pull request #27250 from yuexiao-wang/fix-links
Fix the incorrect links
2016-10-10 15:57:15 +08:00
yuexiao-wang
4b61b18ed2 Fix the incorrect links
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-10 23:26:05 +08:00
Daniel Zhang
434eae7dfd fix issue26244
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2016-10-09 12:36:44 +08:00
Lei Jitang
920aa95aeb Merge pull request #27227 from x1022as/dev
fix typo in client/errors.go comments
2016-10-08 17:14:57 +08:00
Deng Guangxing
a68ba6be5d fix typo in client/errors.go comments
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2016-10-08 15:29:32 +08:00
Tonis Tiigi
d1a83059f7 Fix naivediffdriver timestamp precision bug
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-07 13:52:17 -07:00
Alexander Morozov
058556d7fc Merge pull request #27169 from tonistiigi/move-restartmanager
move restartmanager out of libcontainerd
2016-10-07 13:41:12 -07:00
Alexander Morozov
390a82c3fa Merge pull request #27221 from crosbymichael/update-init
Update grimes to 15ecf9414859b16a8a19ac6748a622a5498d57e3
2016-10-07 13:22:44 -07:00
Tonis Tiigi
a452d1fccb Remove restartmanager from plugins
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-07 12:10:13 -07:00
Tonis Tiigi
606a245d85 Remove restartmanager from libcontainerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-07 12:09:54 -07:00
Michael Crosby
c27116575e 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>
2016-10-07 12:06:42 -07:00
Vincent Demeester
febf53d91a Merge pull request #26996 from Microsoft/jjh/imageinspectosversion
(Windows) Inspect image populate OSVersion
2016-10-07 18:33:01 +02:00
Vincent Demeester
b3cc3d7bf9 Merge pull request #23389 from Microsoft/jjh/credentialspec
Windows: Support credential specs
2016-10-07 18:32:44 +02:00
Vincent Demeester
e42ec6d7cb Merge pull request #27171 from tonistiigi/improve-attach-closed
Improve TestAttachClosedOnContainerStop
2016-10-07 11:26:33 +02:00
Vincent Demeester
91312f71aa Merge pull request #26882 from runcom/proxy-path
Specify userland proxy path
2016-10-07 09:44:39 +02:00
Brian Goff
323f8ceffd Merge pull request #27206 from darrenstahlmsft/MoreWindowsTests
Enabled more test on Windows, API and Build
2016-10-07 08:57:40 +02:00
Darren Stahl
6482410c9d Enabled more test on Windows, API and Build
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-06 17:18:42 -07:00
Victor Vieux
2fd674a00f Merge pull request #27184 from tiborvass/gnupg-debian-stretch
install: fix debian stretch
2016-10-06 14:20:03 -07:00
Tibor Vass
047264763a 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>
2016-10-06 22:23:08 +02:00
John Howard
b7f537e811 Inspect populate image OSVersion
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-06 11:46:24 -07:00
Justin Cormack
5ee2c2a647 Merge pull request #27160 from mlaventure/update-containerd
Update containerd and runc
2016-10-06 19:36:31 +02:00
John Howard
e85867cb68 Windows: Support credential specs
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-06 09:32:22 -07:00