c040e3fa40
Merge pull request #27334 from darrenstahlmsft/ExpandSandboxSizeZero
...
Windows: Stop expanding sandbox size when no new size is specified
Upstream-commit: f2c094cb99b20faba0731509ca9ebb4c5e67e9cf
Component: engine
2016-10-14 17:51:32 -07:00
af33dfda24
Restore Docker logo in README.md
...
Signed-off-by: Ryan Zhang <ryan.zhang@docker.com >
Upstream-commit: 59357bab8c745e873a5c86caed1e2bb2052337a2
Component: engine
2016-10-14 16:12:27 -07:00
12942de674
Merge pull request #27401 from mstanleyjones/toml_to_yaml
...
Convert Markdown frontmatter to YAML
Upstream-commit: 07aa2629e399262e5410c55c1e2276776fd6e3f6
Component: engine
2016-10-14 15:46:21 -07:00
9fe833df60
Convert Markdown frontmatter to YAML
...
Some frontmatter such as the weights, menu stuff, etc is no longer used
'draft=true' becomes 'published: false'
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: b30609446d212624e3d4ce814c70130b75c552a0
Component: engine
2016-10-14 15:44:55 -07:00
4f9853e826
Merge pull request #27395 from mrjana/net
...
Vendoring libnetwork @04025f2a2eebb
Upstream-commit: 678ff27f0fd108b1760b3b0b4939d62b7d5eb6be
Component: engine
2016-10-14 14:54:47 -07:00
da2b0bc963
Merge pull request #27385 from jphuynh/update-jessfraz-github-handle
...
Fix incomplete change from PR #27347 (jessfraz github handle update.)
Upstream-commit: d0a17e4813bcd8663d5168e46292f9f5698f97a6
Component: engine
2016-10-14 14:24:20 -07:00
9bbfdc44cc
Merge pull request #27332 from mstanleyjones/27297
...
Remove contents of docs/ except for reference, point to new location
Upstream-commit: fba04ed0ab783409badad6e673eacb509682a96b
Component: engine
2016-10-14 14:12:09 -07:00
24ba04043a
Add a link to the new build instructions
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 3aeaa9f8fdb835e44edae04d7b43b85e66fcb4c3
Component: engine
2016-10-14 14:05:48 -07:00
f54a7d0f94
Vendoring libnetwork @04025f2a2eebb
...
Fixes #27323
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 9ae9f9812bc078523d64625793c079d99215cb63
Component: engine
2016-10-14 11:12:24 -07:00
c092dceac4
Merge pull request #27363 from tealtail/26227-add-stack-ps-to-docs
...
add documentation for `docker stack ps`, Fixes #26227
Upstream-commit: e8e1c4dfb9a67c56b1001b39f1079a29f7ac8d5a
Component: engine
2016-10-14 10:02:26 -07:00
bab8c78bf2
Fix incomplete change from PR #27347 (jessfraz github handle update.)
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: 666ac08fab62dd407c5d87d197ea7ecc9ff4e767
Component: engine
2016-10-14 14:37:02 +01:00
a5bfdba8fe
Merge pull request #27333 from yongtang/27049-ListOpt
...
Use ListOpt for `docker network create --label` and `docker volume create --label`
Upstream-commit: 66177532b6aad9f127c89f21176c9dc28d0ba8d8
Component: engine
2016-10-14 00:31:09 -07:00
86c7d2f369
Merge pull request #27027 from tonistiigi/fix-name-collision
...
Fix name collision handling in restore
Upstream-commit: 9ced849832dc7a5f15f7fda6d2f3bdb38bbf5483
Component: engine
2016-10-14 08:59:56 +02:00
1e912551c1
Merge pull request #27335 from barracks510/master
...
Simplify function signature
Upstream-commit: 429812f86a7095c19ae48552f6b97150846ca29b
Component: engine
2016-10-13 18:54:01 -07:00
e063aa0187
Merge pull request #27366 from morelena/use_contains
...
all: use strings.Contains instead Index
Upstream-commit: 21a79b503a5c1331d0c000d26179a55fc235b021
Component: engine
2016-10-13 18:44:30 -07:00
6e21c70cae
Merge pull request #26795 from darrenstahlmsft/PauseResume
...
Implement Pause Resume support for Windows
Upstream-commit: dd383898cdcbcef7bd48bc0115cc9a739cf610f3
Component: engine
2016-10-13 18:08:11 -07:00
128dd03e48
Merge pull request #26819 from ripcurld00d/fix_stats_mutex
...
Hide the mutex lock in formatter.ContainerStats
Upstream-commit: ba2c13fcf55a69a67a861be6fa39a7def803f631
Component: engine
2016-10-13 17:38:22 -07:00
70177b59a1
all: use strings.Contains instead Index
...
Signed-off-by: Elena Morozova <lelenanam@gmail.com >
Upstream-commit: a37027f6bdcb2f035fcccd99c6c6064934623a04
Component: engine
2016-10-13 15:55:41 -07:00
b1d937a58f
Merge pull request #27365 from morelena/remove_nil_check
...
all: remove nil check for slices
Upstream-commit: 245bd4c3d2594fae3fd5099f29eef528a4c4accd
Component: engine
2016-10-13 15:27:37 -07:00
0ed22443d3
Merge pull request #27360 from morelena/loop_append
...
all: replace loop with single append
Upstream-commit: f299335e6e100426f3dfb6707b27044f1fdcf12c
Component: engine
2016-10-13 14:52:59 -07:00
17191e6609
all: remove nil check for slices
...
Signed-off-by: Elena Morozova <lelenanam@gmail.com >
Upstream-commit: ace53bbe65d1384893027d046a5d4eae83bd60af
Component: engine
2016-10-13 13:55:38 -07:00
4b9781e130
all: replace loop with single append
...
Signed-off-by: Elena Morozova <lelenanam@gmail.com >
Upstream-commit: 64238fef8c7b739a2ae5648386cf594eb3a162e5
Component: engine
2016-10-13 13:31:52 -07:00
02f69e1006
Merge pull request #27338 from yuexiao-wang/instream-err
...
Fix the incorrect description for NewInStream
Upstream-commit: f1e5349a0353fdbb591e526b52bd32185550f146
Component: engine
2016-10-13 12:32:43 -07:00
3f0929f048
Merge pull request #27276 from yuexiao-wang/func-name
...
Modify function name from SetDaemonLogLevel to SetLogLevel
Upstream-commit: 62503f245f808a6847fe98a84bacfe5ed3bf5c18
Component: engine
2016-10-13 12:10:59 -07:00
ce4d071742
add documentation for docker stack ps
...
also updates related stack docs and removes stack_tasks.md
Signed-off-by: Alicia Lauerman <allydevour@me.com >
Upstream-commit: 970ab9a224658e17894a7673189ad9d2491a592d
Component: engine
2016-10-13 15:09:58 -04:00
a29a28104a
Fix the incorrect description for NewInStream
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 90bddb4243d29e11b2add2f25849fcfce7ee17ec
Component: engine
2016-10-13 22:33:09 +08:00
2bbf5bd013
Merge pull request #27296 from tonistiigi/wait-tasks
...
Wait until tasks have been created in TestSwarmTaskListFilter
Upstream-commit: 535f52c932c24056cf535f0f7aa8cadc880b2194
Component: engine
2016-10-13 15:02:43 +02:00
18a9c67a1b
Merge pull request #27300 from tonistiigi/rm-checkpoint-methods
...
Remove checkpoint methods from builder backend
Upstream-commit: 33cc13466380552bcfd2001b0be053ec8b49a9bd
Component: engine
2016-10-13 15:02:23 +02:00
ea86ba3aa3
Update Jess' github handle after she decided to break the internet
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: 30e61051af33cf9499f7aa6480e291bd1e2ec405
Component: engine
2016-10-13 11:36:05 +01:00
9d1492de52
Merge pull request #27207 from tonistiigi/deprecate-repo-shortid
...
Deprecate repo:shortid syntax
Upstream-commit: 0542dcc2d05d74081d185c35bc4a92716f348506
Component: engine
2016-10-12 23:44:38 -07:00
bec868f66a
Simplify function signature
...
Signed-off-by: Dennis Chen <barracks510@gmail.com >
Upstream-commit: 445620f231ccd2a99e5ebb8fc004dcb254cc2c4b
Component: engine
2016-10-12 21:31:55 -04:00
c622fde306
Stop expanding sandbox size when no new size is specified
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 0da31c68f11d6e2a795b4e4faf7f969916db5f81
Component: engine
2016-10-12 16:58:57 -07:00
35e5de43b0
Remove old documentation, add README.md with pointer
...
Signed-off-by: John Mulhausen <john@docker.com >
Upstream-commit: 29f08cf49bede9bcaf4f06e643988d30be008c0b
Component: engine
2016-10-12 16:23:33 -07:00
f1acbf81f2
Use ListOpt for docker network create --label and docker volume create --label
...
This fix is related to 27049 and 27047. For `--label` flag, if string slice is
used (like 27047), then quote can not be used in command and will result in
an error :
```
line 1, column 14: bare " in non-quoted-field
```
The issue 27047 has been fixed by 27049.
Recently I found out that both `docker network create --label` and `docker volume create --label`
still use string slice and will return the same error when quotes are used.
This fix fixes `docker network create --label` and `docker volume create --label`
by using `ListOpt` (as 27049) as well.
This fix has been tested and verified manually.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e3f484241dc6eebf1c36eea6ae5ff0e5a7aaadff
Component: engine
2016-10-12 16:06:34 -07:00
1f94129ec0
Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz
...
Make authz use pluginv2
Upstream-commit: 8658748ef716e43a5f6d834825d818012ed6e2c4
Component: engine
2016-10-13 00:28:43 +02:00
dc941b3238
Merge pull request #27325 from tonistiigi/net-tests
...
Add requirements for tests that require network
Upstream-commit: aba3a9980492b46515c4c09a8f499fa5ede6123d
Component: engine
2016-10-12 15:08:50 -07:00
00595c5ad4
add 1.12.2 changelog
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f77a31a58a01ae3aace6839170794025d0111b95
Component: engine
2016-10-12 13:12:08 -07:00
ca7f41fc0a
Merge pull request #27305 from yongtang/27294-docs-Size-RefCount
...
Update docs for `Size` and `RefCount` for `UsageData`
Upstream-commit: 98d19efe50554227539698bb60b97d65ba0cfbab
Component: engine
2016-10-12 11:51:21 -07:00
1895cd51cf
Merge pull request #27308 from LK4D4/fix_racy_auth
...
pkg/authorization: make it goroutine-safe
Upstream-commit: c8e8be847850298e8d771c5b501c32f505a875b8
Component: engine
2016-10-12 11:18:59 -07:00
eb62ebf173
Add requirements for tests that require network
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: da9ef68f06e9c73b0913a53dbe31fce3244536a2
Component: engine
2016-10-12 11:11:23 -07:00
955590ce96
Merge pull request #27310 from swernli/servicing-error-reporting
...
Fixing error reporting on servicing failure
Upstream-commit: e736b9a1725bcac02589a7bf61f21c2a0490203d
Component: engine
2016-10-12 08:47:54 -07:00
2db92bdde1
Merge pull request #27217 from Microsoft/jjh/servicingcitest
...
Windows: Test for container servicing
Upstream-commit: 9db46989294621ca63b200a690921ceb62c63db8
Component: engine
2016-10-12 15:50:52 +02:00
8578df04ed
Merge pull request #27225 from darrenstahlmsft/CreateTests
...
Windows: Enable more create tests
Upstream-commit: 310068f6068bc1d46a5faec65b092c085635bf2c
Component: engine
2016-10-12 15:08:32 +02:00
56ddd45521
Merge pull request #27314 from AkihiroSuda/mask-sys-firmware-2
...
oci/defaults_linux.go: mask /sys/firmware
Upstream-commit: 8d1d9eebe3ded3105216dc9a88cc94d16ac6198c
Component: engine
2016-10-12 14:10:12 +02:00
d029c5d315
Merge pull request #27301 from aboch/cfg
...
Update required modules for overlay dataplane encryption
Upstream-commit: 625e9f786aeba8d14e72094a948918524c4247af
Component: engine
2016-10-12 14:07:18 +02:00
f93e5a0e13
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 >
Upstream-commit: 8b1772c86b20d06ae6bd8ccf4b20f6df4cd86b62
Component: engine
2016-10-12 06:07:13 +00:00
77b18735c8
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 >
Upstream-commit: f65647463eb8e6ba0675d295aed492d3617306a2
Component: engine
2016-10-11 17:11:56 -07:00
2a20bc38c9
pkg/authorization: make it goroutine-safe
...
It was racy on config reload
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a616cf3b88ee264b9a565dc0c25e583444ba64e2
Component: engine
2016-10-11 16:31:45 -07:00
83dc9e6cea
Implement Pause Resume support for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 69985e85d37af827fe2940a35d13e8b20a08fc8c
Component: engine
2016-10-11 16:23:35 -07:00
96a5105111
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 >
Upstream-commit: 401778b7e2ccfba31190537de847fcdbce745bd2
Component: engine
2016-10-11 15:53:14 -07:00
