Darren Stahl
69985e85d3
Implement Pause Resume support for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-11 16:23:35 -07:00
Stephen J Day
401778b7e2
client: deterministically resolve http scheme
...
The docker client has historically used Transport.TLSClientConfig to set
the scheme for the API client. A recent moved the resolution to use the
http.Transport directly, rather than save the TLSClientConfig state on a
client struct. This caused issues when mutliple calls made with a single
client would have this field set in the http package on pre-1.7
installations. This fix detects the presence of the TLSClientConfig once
and sets the scheme accordingly.
We still don't know why this issue doesn't happen with Go 1.7 but it
must be more deterministic in the newer version.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-10-11 15:53:14 -07:00
Aaron Lehmann
9bd8c1d332
Merge pull request #26804 from stevvooe/clear-tlsconfig-unix-socket
...
client: pedantic checking of tlsconfig
2016-10-11 15:47:47 -07:00
Yong Tang
a68047fe68
Update docs for Size
and RefCount
for UsageData
...
In 27294, `Size` and `RefCount` has been wrapped into `UsageData`
and is only exposed in `GET system/df`. Though the docs was not
updated in `docker_remote_api_v1.25.md`.
This fix updates the docs to refect the changes for `UsageData`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-11 15:41:00 -07:00
Sebastiaan van Stijn
a7db0a8402
Merge pull request #27294 from mlaventure/hide-unused-volume-fields
...
Move types.Volumes optional fields under a new type
2016-10-11 23:55:25 +02:00
Alessandro Boch
275013ce8b
Update required modules for overlay dataplane encryption
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-11 14:06:55 -07:00
Tonis Tiigi
5fb3b4205a
Remove checkpoint methods from builder backend
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-11 14:00:29 -07:00
Anusha Ragunathan
c5393ee147
Make authorization plugins use pluginv2.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-11 13:09:28 -07:00
Anusha Ragunathan
1845f506e4
Vendor libnetwork.
...
This is primarily for plugingetter import path change.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-11 13:09:01 -07:00
Tianon Gravi
8d6e9f0c6a
Merge pull request #27005 from lizzha/azurechina
...
Use the mirror in China for Azure China environment
2016-10-11 13:04:11 -07:00
Tonis Tiigi
f8229aea9f
Wait until tasks have been created in TestSwarmTaskListFilter
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-11 11:56:42 -07:00
Kenfe-Mickael Laventure
d36952749d
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>
2016-10-11 11:49:26 -07:00
Anusha Ragunathan
a98be0344b
Update plugingetter import path in docker/docker.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-11 11:24:18 -07:00
Alexander Morozov
61753568f5
Merge pull request #27271 from tonistiigi/fix-test-timeout
...
Reduce TestRunCommandWithTimeoutKilled flakiness
2016-10-11 09:24:13 -07:00
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
yuexiao-wang
fe3ff54c7a
Modify function name from SetDaemonLogLevel to SetLogLevel
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-11 19:35:12 +08: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
Liz Zhang
451979a368
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>
2016-10-11 17:27:18 +08: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
allencloud
3af743bb32
return nil when no node or service to avoid additional api call
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-11 10:59:16 +08: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
Tonis Tiigi
797f630d2e
Reduce TestRunCommandWithTimeoutKilled flakiness
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-10 17:31:37 -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
Boaz Shuster
929a77b814
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>
2016-10-10 21:52:53 +03: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
Darren Stahl
45fe59931a
Windows: Enable more create tests
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-10 10:34:03 -07: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