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
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
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
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
63ffa4c22f
Merge pull request #27347 from jphuynh/update-jessfraz-github-handle
...
Update jessfraz's github handle after she decided to break the internet
Upstream-commit: 13279b77d22720c78dbd6e01fde1e5e4c8f56742
Component: engine
2016-10-13 13:57:29 +01: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
