Commit graph

29914 commits

Author SHA1 Message Date
Brian Goff
e91604c0d2 Merge pull request #29212 from yongtang/29185-docker-inspect
Fix `docker plugin inspect <unkown object>` issue on Windows
2016-12-21 15:47:17 -05:00
Brian Goff
b567e8777d Merge pull request #28594 from Microsoft/jjh/fixtodo
Windows: Fix a longstanding TODO
2016-12-21 15:46:00 -05:00
Brian Goff
267d6935c5 Merge pull request #28714 from thaJeztah/move-logdriver-check-to-daemon
move check for supported drivers to daemon
2016-12-21 13:47:30 -05:00
Brian Goff
aa188634cc Merge pull request #28888 from endophage/notary0.5.0
updating notary to released 0.5.0 version
2016-12-21 13:44:18 -05:00
Brian Goff
7548fc7637 Merge pull request #28900 from tophj-ibm/ppc64le-rpmbuild-fedora23
[ppc64le] add make rpm for fedora 24
2016-12-21 13:43:13 -05:00
Brian Goff
d65d5db2a0 Merge pull request #29491 from yongtang/12162016-stats-error
Improve error output for `docker stats ...`
2016-12-21 13:19:20 -05:00
Brian Goff
b2e348f2a6 Merge pull request #29527 from allencloud/change-minor-mistake
change minor mistake of spelling
2016-12-21 13:15:00 -05:00
Brian Goff
de92e2fa74 Merge pull request #29577 from lixiaobing10051267/masterDevice
several function names fixed in devmapper.go
2016-12-21 12:21:22 -05:00
Brian Goff
584485abca Merge pull request #29637 from wxb0521/bo-docker-0.5
some punctuation errors and a verb form error
2016-12-21 12:18:04 -05:00
Brian Goff
fbc1f1a40c Merge pull request #29633 from qar/fix/docs
Fix document typos
2016-12-21 12:17:29 -05:00
Doug Davis
7a94c6974f Merge pull request #29623 from luojie233/branch3
duplicated "the"
2016-12-21 11:33:34 -05:00
Sebastiaan van Stijn
2d1b578e67 Merge pull request #29611 from johnstep/ps-make-dco
Fix regular expression for PowerShell DCO check
2016-12-21 13:36:33 +01:00
Jie Luo
ea2dd4b5d0 duplicated the
Signed-off-by: Jie Luo <luo612@zju.edu.cn>

typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix some typos

Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 20:16:19 +08:00
Xinbo Weng
32996d6016 some punctuation errors and a verb form error
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
2016-12-21 20:05:19 +08:00
WANG Yuexiao
1ea0be9dbc Remove unused var 'errTLSConfigUnavailable' (#29626)
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-21 06:41:14 -05:00
Anran Qiao
3dc3921c76
Fix document typos
Change the `State` field of the `/containers/json` remote API response to lowercase.
This change involves docs/api/v1.23.md and docs/api/v1.24.md

Signed-off-by: Anran Qiao <anran.qiao@daocloud.io>
2016-12-21 18:28:52 +08:00
Yong Tang
0b3c10ac4d Fix docker plugin inspect <unkown object> issue on Windows
This fix is a follow up for comment:
https://github.com/docker/docker/pull/29186/files#r91277345

While #29186 addresses the issue of `docker inspect <unknown object>`
on Windows, it actually makes `docker plugin inspect <unknown object>`
out `object not found` on Windows as well. This is actually misleading
as plugin is not supported on Windows.

This fix reverted the change in #29186 while at the same time,
checks `not supported` in `docker inspect <unknown object>` so that
- `docker plugin inspect <unknown object>` returns `not supported` on Windows
- `docker inspect <unknown object>` returns `not found` on Windows

This fix is related to #29186 and #29185.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-20 21:05:10 -08:00
lixiaobing10051267
f93b41e926 several function names fixed in devmapper.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-21 10:45:28 +08:00
Sebastiaan van Stijn
fb41283e49 Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win
updates to glossary re: d4mac, d4win, toolbox per user request
2016-12-21 02:16:28 +01:00
John Stephens
0ce6c12f88
Fix regular expression for PowerShell DCO check
Signed-off-by: John Stephens <johnstep@docker.com>
2016-12-20 15:32:39 -08:00
Tibor Vass
0d5a715931 Merge pull request #29470 from cyli/ask-for-unlock-key-only-if-locked
Check if a swarm is locked before asking a user to enter their unlock key
2016-12-20 13:21:47 -08:00
Sebastiaan van Stijn
b1cb897998 Merge pull request #29450 from yongtang/29291-no-default-replicas-output
Fix misleading defaults for service create/update
2016-12-20 17:11:05 +01:00
Sebastiaan van Stijn
e6d06a5271 Merge pull request #29583 from liliVicky/my-feature2
correct some words
2016-12-20 15:37:59 +01:00
Brian Goff
9eb9abea6d Merge pull request #29589 from lixiaobing10051267/masterDockerPs
field NAMES ommitted after docker ps in commit.md
2016-12-20 09:27:13 -05:00
Brian Goff
dc8a6d91fb Merge pull request #29550 from LK4D4/fix_commit
commit: do not change container labels on commit
2016-12-20 09:25:09 -05:00
allencloud
7c3657065c change minor mistake of spelling
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-20 21:05:19 +08:00
lixiaobing10051267
f34ccd70c8 field NAMES ommitted after docker ps in commit.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-20 20:34:09 +08:00
Sebastiaan van Stijn
0d93970c52 Merge pull request #29569 from allencloud/update-docs-about-oom-score-adj
update docs about  --oom-score-adj
2016-12-20 13:18:57 +01:00
liwenqi
b506f8ecdd correct some words
Signed-off-by: liwenqi <vikilwq@zju.edu.cn>

Update ISSUE-TRIAGE.md

Signed-off-by: vicky <395658237@qq.com>
2016-12-20 17:43:26 +08:00
Yong Tang
acc93db32b Fix misleading default for --replicas
This fix tries to address the issue raised in 29291 where
the output of `--replicas` in `service create/update`:
```
      --replicas uint                    Number of tasks (default none)
```
is misleading. User might incorrectly assume the number of replicas
would be `0` (`none`) by default, while the actual default is `1`.

The issue comes from the fact that some of the default values are
from daemon and it is not possible for client to find out the default
value.

In this case, it might be better to just simply not displaying `(default none)`.

This fix returns "" for `Uint64Opt` so that `(default none)` is hidden.

In addition to `--replicas`, this fix also changes
`--restart-delay`, `--restart-max-attempts`, `--stop-grace-period`,
`--health-interval`, `--health-timeout`, and `--restart-window`
in a similiar fashion.

New Output:
```
      --health-interval duration         Time between running the check (ns|us|ms|s|m|h)
      --health-timeout duration          Maximum time to allow one check to run (ns|us|ms|s|m|h)
...
      --replicas uint                    Number of tasks
...
      --restart-delay duration           Delay between restart attempts (ns|us|ms|s|m|h)
      --restart-max-attempts uint        Maximum number of restarts before giving up
      --restart-window duration          Window used to evaluate the restart policy (ns|us|ms|s|m|h)
...
      --stop-grace-period duration       Time to wait before force killing a container (ns|us|ms|s|m|h)
```

The docs has been updated. Note the docs for help output of `service create/update`
is out of sync with the current master. This fix replace with the update-to-date
help output.

This fix fixes 29291.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-19 19:35:05 -08:00
Akihiro Suda
2cf32ee043 Merge pull request #29525 from lixiaobing10051267/masterDiff
Use wrong ApplyLayer in diff_windows.go
2016-12-20 12:32:54 +09:00
EnergyLiYN
d1561620a7 There should be plural (#29571)
Signed-off-by: lyn <energylyn@zju.edu.cn>
2016-12-19 22:31:07 -05:00
allencloud
bb85d483b7 update docs about --oom-score-adj
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-20 11:14:39 +08:00
Victoria Bialas
56af047ca8 updates to d4win description per review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-19 17:41:51 -08:00
Victoria Bialas
b9e5a6228f updates to glossary re: d4mac, d4win, toolbox per user request
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-19 17:25:04 -08:00
Tõnis Tiigi
288e55c09b Merge pull request #29546 from cpuguy83/29505_fix_overay2_check_plugin
Ensure test graphdriver plugin runs on test host
2016-12-19 16:16:42 -08:00
Tibor Vass
77dde3efa7 Merge pull request #29246 from thaJeztah/improve-swarm-check-in-inspect
Ignore certificate expiry error for top-level inspect
2016-12-19 15:37:53 -08:00
Tõnis Tiigi
aecb79ff98 Merge pull request #29339 from dmcgowan/plugins-abstract-download-manager
Abstract layerstore from pull/push distribution code
2016-12-19 13:32:28 -08:00
Brian Goff
e4ebc92edc Ensure test graphdriver plugin runs on test host
Sets a kernel requirement for for `TestGraphdriverPlugin` since the
graphdriver being used is overlay2.. and also makes sure to skip the
kernel check in the actual graphdriver since we may be able to detect
kernels with backported support for overlay2 style mounts a bit more
freely in the test code.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-19 16:05:22 -05:00
Sebastiaan van Stijn
db5159b78d Merge pull request #29551 from albers/completion-remove-daemon
Remove bash completion for deprecated `docker daemon`
2016-12-19 20:52:13 +01:00
Harald Albers
536a9ec698 Remove bash completion for deprecated docker daemon
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-19 11:40:59 -08:00
Tõnis Tiigi
5add856be6 Merge pull request #29522 from codevulture/master
Change -tlsverify to --tlsverify in warning
2016-12-19 11:11:17 -08:00
Derek McGowan
3c7676a057
Abstract distribution interfaces from image specific types
Move configurations into a single file.
Abstract download manager in pull config.
Add supports for schema2 only and schema2 type checking.
Add interface for providing push layers.
Abstract image store to generically handle configurations.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2016-12-19 10:55:00 -08:00
Derek McGowan
61ac7c4bf8
Update distribution vendor for manifest builder change
Manifest builder allows setting the configuration type
for the manifest being build. Additionally the default
type has been renamed to reflect it is an image type.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2016-12-19 10:54:55 -08:00
Alexander Morozov
ca6c6f0765 commit: do not change container labels on commit
Fix #29547

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-12-19 09:56:20 -08:00
Sebastiaan van Stijn
a58b5830b1 Merge pull request #26576 from allencloud/change-cluster-response-status-code
update response status code for cluster request
2016-12-19 18:31:45 +01:00
Vincent Demeester
38886bbd74 Merge pull request #29513 from thaJeztah/fix-anonymous-volumes
fix conversion of anonymous volumes in compose-file
2016-12-19 17:16:00 +01:00
Sebastiaan van Stijn
d477a24ec5 Merge pull request #29539 from vdemeester/integration-remove-workingdir
[test-integration] global variable workingDirectory is not needed…
2016-12-19 15:18:02 +01:00
Sebastiaan van Stijn
fc5b5a4d1b Merge pull request #29543 from EnergyLiYN/br2
Header has incorrect punctuation.
2016-12-19 14:54:51 +01:00
Vincent Demeester
8a41c1d548 Merge pull request #29541 from tim-zju/spellError
spell error: in other parts, they are lower-case
2016-12-19 14:48:31 +01:00