fa70234a33
Merge pull request #27294 from mlaventure/hide-unused-volume-fields
...
Move types.Volumes optional fields under a new type
Upstream-commit: a7db0a8402c5e770501adb7a1efb82adff65e3f8
Component: engine
2016-10-11 23:55:25 +02:00
3cf3d53749
Update required modules for overlay dataplane encryption
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 275013ce8b769082b723c4eec0850b10e6dfb7be
Component: engine
2016-10-11 14:06:55 -07:00
c39b9d6194
Remove checkpoint methods from builder backend
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 5fb3b4205a8b0635ff193791ef581939806eb8da
Component: engine
2016-10-11 14:00:29 -07:00
d71f1080b9
Make authorization plugins use pluginv2.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: c5393ee147e981ded8fdf12c8da790abd1130175
Component: engine
2016-10-11 13:09:28 -07:00
a97d7743a8
Vendor libnetwork.
...
This is primarily for plugingetter import path change.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 1845f506e4dad6916fd10564e2c8b0b18f43a7c9
Component: engine
2016-10-11 13:09:01 -07:00
60ebef1784
Merge pull request #27005 from lizzha/azurechina
...
Use the mirror in China for Azure China environment
Upstream-commit: 8d6e9f0c6ac6c77dee3b5a984c19c699660f7abb
Component: engine
2016-10-11 13:04:11 -07:00
29de0702ce
Wait until tasks have been created in TestSwarmTaskListFilter
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f8229aea9f21c44933374b17176caeb3f28f459c
Component: engine
2016-10-11 11:56:42 -07:00
3dd231fb94
Move types.Volumes optional fields under a new type
...
This allows us to hide those fields when they are not filled.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: d36952749d7db1a7dac40f7ddf3ed485f23b33fc
Component: engine
2016-10-11 11:49:26 -07:00
effa6f4094
Update plugingetter import path in docker/docker.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: a98be0344b24d71235c17a87ff425f3d602e48e8
Component: engine
2016-10-11 11:24:18 -07:00
12339e1063
Merge pull request #27271 from tonistiigi/fix-test-timeout
...
Reduce TestRunCommandWithTimeoutKilled flakiness
Upstream-commit: 61753568f5e482c551df6f3693cb7c942261b7de
Component: engine
2016-10-11 09:24:13 -07:00
2722bc3d62
Merge pull request #26565 from justincormack/pinata-bundle
...
Add a script to install a bundle into Docker for Mac
Upstream-commit: c98571b8f8a6e2140492e057a66c2b2b9741af33
Component: engine
2016-10-11 16:17:49 +02:00
5a907ff50f
Merge pull request #26782 from cdrage/add-nat-check-to-script
...
Add check for CONFIG_IP_NF_NAT to kernel check
Upstream-commit: 45d346291463a594090b96b28d110539f2d66502
Component: engine
2016-10-11 15:14:53 +02:00
9dfec63192
Merge pull request #26954 from mrjana/net
...
Vendoring libnetwork @7b74403
Upstream-commit: 5ff17cb4aae435715733c169fce21a3677cd21a7
Component: engine
2016-10-11 05:59:35 -07:00
e8a02789bc
Merge pull request #26896 from jmzwcn/issue26244
...
Fix issue26244:swarm service, with overlay network, fails to remove all containers
Upstream-commit: f7d1682c604429fcdf3c2c2225bde324b0861780
Component: engine
2016-10-11 14:40:39 +02:00
d0516ab406
Merge pull request #26970 from wzhliang/restart-stopped-container
...
zsh: allow restarting stopped containers by id
Upstream-commit: 6b997739fe5f4de411ccf30be574ee11a2780018
Component: engine
2016-10-11 14:37:54 +02:00
a44c26a0a1
Modify function name from SetDaemonLogLevel to SetLogLevel
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: fe3ff54c7a87d475d5b2a799c5c85e6300c371db
Component: engine
2016-10-11 19:35:12 +08:00
48cd323c6e
Merge pull request #26894 from thaJeztah/improve-log-level-help
...
Improve --log-level help text
Upstream-commit: f65bf11e267b1788da12b5af5f41b44ce160cf69
Component: engine
2016-10-11 12:35:42 +02:00
2e79f0c54a
Use the mirror in China for Azure China environment
...
Signed-off-by: Liz Zhang <lizzha@microsoft.com >
Use the mirror in China for Azure China environment
Signed-off-by: Liz Zhang <lizzha@microsoft.com >
Update option name to --mirror
Signed-off-by: Liz Zhang <lizzha@microsoft.com >
Update indent and change variable name
Signed-off-by: Liz Zhang <lizzha@microsoft.com >
Upstream-commit: 451979a368c0fcb7990bcce82122609a7b412428
Component: engine
2016-10-11 17:27:18 +08:00
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
8544599d78
Call the AuthZRes function also when the daemon returns error
...
Signed-off-by: Ezra Silvera <ezra@il.ibm.com >
Upstream-commit: 5a8ff4025408ed7a30a829008edf509c02f7a258
Component: engine
2016-10-11 09:53:30 +03:00
9525b615e5
return nil when no node or service to avoid additional api call
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 3af743bb329df9e044d3807cde4200ff6da7bf7c
Component: engine
2016-10-11 10:59:16 +08:00
f1f88179ba
Reduce TestRunCommandWithTimeoutKilled flakiness
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 797f630d2e3c9180848b1adb7fd6fa879f284165
Component: engine
2016-10-10 17:31:37 -07:00
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
21e065470e
Vendoring libnetwork @7b74403be424
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 83ba14a55229c4e52293ef0877cadb2b83bb7f0b
Component: engine
2016-10-10 14:39:02 -07:00
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
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
01236b1c83
Improve --log-level help text
...
This information was added in
1efc940e6f547760e5e8f4648acb120ff19fdc58,
but removed again in
a271eaeba224652e3a12af0287afbae6f82a9333
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 >
Upstream-commit: 3197b312d03e6dc2c12a815bbc2632edfb03bb25
Component: engine
2016-10-10 23:10:17 +02:00
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
3cabe08abe
Hide the mutex in formatter.ContainerStats
...
The formatter.ContainerStats struct exposes its Mutex.
This is a bad design and should be fixed.
To fix that, I separated the statistics
attributes from ContainerStats to StatsEntry and
hid the mutex. Notice that the mutex protects both
the `err` field and the statistics attributes.
Then, implemented SetStatistics, SetError, GetStatistics
and GetError to avoid races.
Moreover, to make this less granular, I decided to
replace the read-write mutex with the regular mutex and
to pass a StatsEntry slice to formatter.ContainerStatsWrite
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 929a77b814dfe9ab7a11bffc2d16eebd27bd903a
Component: engine
2016-10-10 21:52:53 +03:00
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
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
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
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
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
227a6ecf04
Windows: Enable more create tests
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 45fe59931a3859b51a37156177d3c8f29df4aa6a
Component: engine
2016-10-10 10:34:03 -07:00
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
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
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
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
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
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
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
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
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
03a7d7e8f9
Align bash completion of volumes to completion of nodes and services
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 06d4c117600c99cc6d5cefc26c6692282143ff8d
Component: engine
2016-10-09 04:46:20 -07:00
5c631e04b7
fix issue26244
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: 434eae7dfd1612d8de292480d4c31c68fceffa68
Component: engine
2016-10-09 12:36:44 +08:00
be8c9639a4
Align bash completion of networks to completion of nodes and services
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5207fe75ae32ed36c4f2d30dc91d8611e34e61da
Component: engine
2016-10-08 10:50:31 -07:00
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
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
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
Sebastiaan van Stijn
Alessandro Boch
Tonis Tiigi
Anusha Ragunathan
Tianon Gravi
Kenfe-Mickael Laventure
Alexander Morozov
Madhu Venugopal
Vincent Demeester
yuexiao-wang
Liz Zhang
Justin Cormack
Ezra Silvera
allencloud
John Howard
Jana Radhakrishnan
Sebastiaan van Stijn
Boaz Shuster
Alexander Morozov
Aaron Lehmann
Darren Stahl
Tibor Vass
Lei Jitang
Lizzie Dixon
Ben Firshman
Harald Albers
Daniel Zhang
Deng Guangxing