bddbeade83
Merge pull request #27392 from Microsoft/jjh/securitydescriptor
...
Windows: Set administrators ACL on debug listener
Upstream-commit: e40c512f60c971da4912ba3740e209c4b40b690d
Component: engine
2016-10-17 17:13:38 +02:00
2a36eb47f4
Merge pull request #27367 from Microsoft/jjh/fieldsincontainer
...
Windows: Factor out unused fields in container
Upstream-commit: b0f3d7a1b5e52a446f52beaecbc30102e1b954d8
Component: engine
2016-10-17 16:50:39 +02:00
5e0a03849e
Merge pull request #27074 from cyli/bump-notary-version
...
Bump notary version to 0.4.2
Upstream-commit: a7c883fb04412174dfa2c31d030c643e0c20ca1d
Component: engine
2016-10-17 16:35:57 +02:00
a08dc5dfdf
Merge pull request #27419 from yongtang/10162016-warning
...
Fix an incorrect `WARNING` output in `docker run/create`
Upstream-commit: 55cd8f53c9bc2e1d53ff3761c1109309fee6f4f7
Component: engine
2016-10-17 18:37:03 +08:00
73564e83d6
Merge pull request #27431 from thaJeztah/improve-more-examples
...
Improve API format examples
Upstream-commit: a2ad35973019f72dab8bd9f94b6ca0769307318f
Component: engine
2016-10-17 05:35:10 +02:00
e551cfbd30
Improve API format examples
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8e02b29d247379d66280babcf654e467989bd4bb
Component: engine
2016-10-16 19:54:08 -07:00
88c384f7af
Merge pull request #27428 from thaJeztah/improve-example-format
...
Improve example for env vars in API docs
Upstream-commit: 6f8d11d440b7cefd2202c816bb40024463471623
Component: engine
2016-10-17 04:32:58 +02:00
d77bcd1691
Improve example for env vars in API docs
...
This was added in e41de3e6318ad4cb30eabab9bec60f9fb9d7a76b,
but can be a bit confusing due to the "outer" brackets
being for JSON, and the "inner" brackets to indicate
optional values.
During review of that change, this alternative
format was suggested.
Updating the example to use the format that was discussed
during review :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 441c9411e369f5146783c46d7a9413917dacaebe
Component: engine
2016-10-16 19:22:42 -07:00
91be57517e
Fix an incorrect WARNING output in docker run/create
...
This fix tries to fix an incorrect `WARNING` output in `docker run/create`:
```
ubuntu@ubuntu:~/docker$ docker run -d --cpu-percent 80 busybox top
WARNING: %s does not support CPU percent. Percent discarded.
WARNING: linux
e963d1108e455e7f8f57626ca1305b5f1999e46025d2865b9a21fc8abc51a546
```
The reason was that in `daemon/daemon_unix.go`, the warning string
was not combined with `fmt.Sprintf` before appended to the output.
This fix fixes this issue.
This fix has been manually tested and verified:
```
ubuntu@ubuntu:~/docker$ docker run -d --cpu-percent 80 busybox top
WARNING: linux does not support CPU percent. Percent discarded.
fcf53f79d389235bae846d3d40804834659ac025edbc0d075ed91841a8e4c740
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 40f25809abacc99953385dbe6b107218d8b5522f
Component: engine
2016-10-16 17:11:39 -07:00
246994fa74
Merge pull request #27416 from AkihiroSuda/fix-failing-TestBuildLabelsOverride
...
[test] fix failure of TestBuildLabelsOverride on Windows
Upstream-commit: 319a929c371525b7521d08dcc13fb34317a76ff4
Component: engine
2016-10-16 15:14:57 -07:00
5c9492231e
Merge pull request #27236 from allencloud/return-nil-when-no-node-or-service
...
return nil when no node or service to avoid additional api call
Upstream-commit: 9f5ffa2a81c7490eca44a473f77cad03a1267808
Component: engine
2016-10-16 18:41:31 +02:00
2fac2c1b97
[test] fix failure of TestBuildLabelsOverride on Windows
...
TestBuildLabelsOverride was consistently failing due to "Windows does not support FROM scratch" error
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: bb17d1fabbd75d76edb8bf26e006ff0238ba8c00
Component: engine
2016-10-16 11:05:31 +00:00
d0bb362133
Merge pull request #27341 from milindchawre/doc-change
...
Fixes #27095 : Removing registrytoken field from doc as it is depreca…
Upstream-commit: 2a3ba03424cd5286f4410e2c0c1fb093f297c572
Component: engine
2016-10-15 11:40:48 -07:00
e3ae59fba6
Fixes #27095 : Removing registrytoken field from doc as it is deprecated by identitytoken field
...
Signed-off-by: milindchawre <milindchawre@gmail.com >
Upstream-commit: 72dd684c88976b7c76cceeafe0ab6c98c8963b62
Component: engine
2016-10-15 08:38:33 +00:00
086cdbe518
Merge pull request #27174 from duglin/Issue26027
...
Don't env-var evaluate labels from docker build cmd line
Upstream-commit: 6f54d70a54d8d711e2b9d1e2578d45682e7130b8
Component: engine
2016-10-14 20:57:41 -07:00
da28368db8
Merge pull request #26928 from thaJeztah/update-release-checklist
...
Add updating AUTHORS to the release checklist
Upstream-commit: 9b2970283b4ea26016e6746831a0fbbeb790772e
Component: engine
2016-10-14 18:33:26 -07:00
c6ab589035
Merge pull request #27322 from yongtang/25855-deploy-dab-extension
...
Allow `docker deploy` command accept stack with/without extension
Upstream-commit: 4a6b37eb3ef3cb9751a9fe114b4628c8696b2c6a
Component: engine
2016-10-14 18:26:49 -07:00
f2c48492e1
Merge pull request #27368 from morelena/move_close
...
integration-cli: move Close() after error check
Upstream-commit: 12212943862b46fa4d4d3ed4fbece31f70e300c8
Component: engine
2016-10-14 18:25:36 -07:00
3962433600
Fix API incompatibilities between notary v0.3.0 and v0.4.2:
...
- some function signatures have changed - use the new ones
- re-generate the notary delegation key certs, since notary doesn't allow SHA1
- fix some error message mapping because now if a root rotation fails to validate trusted operations will fail
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 0797af39c2abb681a0e291651686872539a9e187
Component: engine
2016-10-14 17:53:34 -07:00
58bc04a76a
Bump vendored and dockerfile notary version to v0.4.2
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 5f4dcd825299bf58e87e69c2bff3ceefc300a432
Component: engine
2016-10-14 17:52:56 -07:00
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
b7983be9df
Merge pull request #27403 from ry4nz/restore-logo
...
Restore Docker logo in README.md
Upstream-commit: 68951594ef0def6ec44fd5adc78162d9ac784881
Component: engine
2016-10-14 16:15:55 -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
6f9659dfb5
Allow docker deploy command accept filename with/without extension
...
This fix tries to address the issue raised in 25855 where the command
`docker deploy` can only accept a STACK without extension of `.dab`.
In other words, `docker deploy hellojavaee.dab` gives an error:
```
Bundle hellojavaee.dab.dab not found. Specify the path with --file
```
This fix updates the way namespace STACK is taken so that in case
`STACK.dab` is provided with `docker deploy`:
```
$ docker deploy STACK.dab
```
The `STACK` is used as namespace (instead of `STACK.dab`).
NOTE: This fix will only allows `.dab` extension in namespace, because
it is not possible to have a namespace with `.` in the middle. In other
words, a namespace `hello.java.ee` will not work anyway (whether the file
`hello.java.ee` exists or not).
An additional integration test has been added to cover the changes.
This fix fixes 25855.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1e9d04c458e90f38c970c7937830504d2e919066
Component: engine
2016-10-14 11:44:15 -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
dfcee0ffa0
Windows: Set ACL on debug listener
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 192e6d9995f93b2876833ad5d49eb18c1b984395
Component: engine
2016-10-14 09:15:17 -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
755707be54
integration-cli: move Close() after error check
...
Signed-off-by: Elena Morozova <lelenanam@gmail.com >
Upstream-commit: 2b9786a9b3ed00dbc3b11b673e7a52a02ed0b4d6
Component: engine
2016-10-13 16:07:08 -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
763c2d8e2f
Windows: Factor out unused fields in container
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 600f0ad21142f4085330107f629a80099af0490f
Component: engine
2016-10-13 14:51:10 -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
