beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27847 commits 14 branches 412 tags 338 MiB
Commit graph

27847 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
f1e5349a03 Merge pull request #27338 from yuexiao-wang/instream-err 
Fix the incorrect description for NewInStream
 2016-10-13 12:32:43 -07:00
Tõnis Tiigi
62503f245f Merge pull request #27276 from yuexiao-wang/func-name 
Modify function name from SetDaemonLogLevel to SetLogLevel
 2016-10-13 12:10:59 -07:00
yuexiao-wang
90bddb4243 Fix the incorrect description for NewInStream 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-13 22:33:09 +08:00
Tibor Vass
535f52c932 Merge pull request #27296 from tonistiigi/wait-tasks 
Wait until tasks have been created in TestSwarmTaskListFilter
 2016-10-13 15:02:43 +02:00
Tibor Vass
33cc134663 Merge pull request #27300 from tonistiigi/rm-checkpoint-methods 
Remove checkpoint methods from builder backend
 2016-10-13 15:02:23 +02:00
Justin Cormack
13279b77d2 Merge pull request #27347 from jphuynh/update-jessfraz-github-handle 
Update jessfraz's github handle after she decided to break the internet
 2016-10-13 13:57:29 +01:00
Jean-Pierre Huynh
30e61051af Update Jess' github handle after she decided to break the internet 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 2016-10-13 11:36:05 +01:00
Sebastiaan van Stijn
0542dcc2d0 Merge pull request #27207 from tonistiigi/deprecate-repo-shortid 
Deprecate repo:shortid syntax
 2016-10-12 23:44:38 -07:00
Tibor Vass
8658748ef7 Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz 
Make authz use pluginv2
 2016-10-13 00:28:43 +02:00
Victor Vieux
aba3a99804 Merge pull request #27325 from tonistiigi/net-tests 
Add requirements for tests that require network
 2016-10-12 15:08:50 -07:00
Victor Vieux
32f93fdd25 Merge pull request #27328 from vieux/1.12.2_changelog 
add 1.12.2 changelog
 2016-10-12 13:20:02 -07:00
Victor Vieux
f77a31a58a add 1.12.2 changelog 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-12 13:12:08 -07:00
Tõnis Tiigi
98d19efe50 Merge pull request #27305 from yongtang/27294-docs-Size-RefCount 
Update docs for `Size` and `RefCount` for `UsageData`
 2016-10-12 11:51:21 -07:00
Tõnis Tiigi
c8e8be8478 Merge pull request #27308 from LK4D4/fix_racy_auth 
pkg/authorization: make it goroutine-safe
 2016-10-12 11:18:59 -07:00
Tonis Tiigi
da9ef68f06 Add requirements for tests that require network 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-12 11:11:23 -07:00
John Howard
e736b9a172 Merge pull request #27310 from swernli/servicing-error-reporting 
Fixing error reporting on servicing failure
 2016-10-12 08:47:54 -07:00
Vincent Demeester
9db4698929 Merge pull request #27217 from Microsoft/jjh/servicingcitest 
Windows: Test for container servicing
 2016-10-12 15:50:52 +02:00
Vincent Demeester
310068f606 Merge pull request #27225 from darrenstahlmsft/CreateTests 
Windows: Enable more create tests
 2016-10-12 15:08:32 +02:00
Tibor Vass
8d1d9eebe3 Merge pull request #27314 from AkihiroSuda/mask-sys-firmware-2 
oci/defaults_linux.go: mask /sys/firmware
 2016-10-12 14:10:12 +02:00
Tibor Vass
625e9f786a Merge pull request #27301 from aboch/cfg 
Update required modules for overlay dataplane encryption
 2016-10-12 14:07:18 +02:00
Antonio Murdaca
d3ee780bc5 Merge pull request #27306 from stevvooe/deterministic-client-scheme 
client: deterministically resolve http scheme
 2016-10-12 10:50:55 +02:00
Akihiro Suda
8b1772c86b oci/defaults_linux.go: mask /sys/firmware 
On typical x86_64 machines, /sys/firmware can contain SMBIOS and ACPI tables.
There is no need to expose the directory to containers.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-10-12 06:07:13 +00:00
Stefan J. Wernli
f65647463e Fixing error reporting on servicing failure 
The code that handles waiting for the servicing container to complete correctly grabs the exit code and logs a failure, but doesn't return that failure to the caller, mistakenly causing servicing operations to look successful when they really failed during processing.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2016-10-11 17:11:56 -07:00
Alexander Morozov
a616cf3b88 pkg/authorization: make it goroutine-safe 
It was racy on config reload

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-10-11 16:31:45 -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
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