1
0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Commit Graph

28110 Commits

Author SHA1 Message Date
Harald Albers
b979364e01 Improve bash completion for bundled plugins
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9ca56f7683ae05ce9fd84a8606329c4c00269cd7
Component: engine
2016-12-20 13:28:46 -08:00
Sebastiaan van Stijn
d224f4ec28 Merge pull request #29450 from yongtang/29291-no-default-replicas-output
Fix misleading defaults for service create/update
Upstream-commit: b1cb8979987c5a7ba4b8a30f0ba5147d76671c01
Component: engine
2016-12-20 17:11:05 +01:00
Sebastiaan van Stijn
35814260ea Merge pull request #29583 from liliVicky/my-feature2
correct some words
Upstream-commit: e6d06a5271cd176b38aac02d97163e65ece500a9
Component: engine
2016-12-20 15:37:59 +01:00
Brian Goff
92139ffe94 Merge pull request #29589 from lixiaobing10051267/masterDockerPs
field NAMES ommitted after docker ps in commit.md
Upstream-commit: 9eb9abea6d22e795298871500df061ec7e9644f6
Component: engine
2016-12-20 09:27:13 -05:00
Brian Goff
e877ead08e Merge pull request #29550 from LK4D4/fix_commit
commit: do not change container labels on commit
Upstream-commit: dc8a6d91fb154c96a34ea5e850b25f5c2e88fe19
Component: engine
2016-12-20 09:25:09 -05:00
lixiaobing10051267
3f00f70bbf field NAMES ommitted after docker ps in commit.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: f34ccd70c8c55946fe9d3b83b44bdac770858176
Component: engine
2016-12-20 20:34:09 +08:00
Sebastiaan van Stijn
5c41fff748 Merge pull request #29569 from allencloud/update-docs-about-oom-score-adj
update docs about  --oom-score-adj
Upstream-commit: 0d93970c527b7bbe970655ada658f3c7466d015a
Component: engine
2016-12-20 13:18:57 +01:00
liwenqi
420207ba8c correct some words
Signed-off-by: liwenqi <vikilwq@zju.edu.cn>

Update ISSUE-TRIAGE.md

Signed-off-by: vicky <395658237@qq.com>
Upstream-commit: b506f8ecdd5ca8adb5d8ad77f085283ee5f584d6
Component: engine
2016-12-20 17:43:26 +08:00
Yong Tang
96f73955fb 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>
Upstream-commit: acc93db32bd0d14801db65d6cb0a0e06d7cec2f7
Component: engine
2016-12-19 19:35:05 -08:00
Akihiro Suda
1ab863db0a Merge pull request #29525 from lixiaobing10051267/masterDiff
Use wrong ApplyLayer in diff_windows.go
Upstream-commit: 2cf32ee04360add15b4431ba55032824ac089349
Component: engine
2016-12-20 12:32:54 +09:00
EnergyLiYN
44e172af71 There should be plural (#29571)
Signed-off-by: lyn <energylyn@zju.edu.cn>
Upstream-commit: d1561620a756e5fb98d6683af7089fe36a9639de
Component: engine
2016-12-19 22:31:07 -05:00
allencloud
e32e0ddf32 update docs about --oom-score-adj
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: bb85d483b7cc53ad36d062f624f36ac58e2c9b40
Component: engine
2016-12-20 11:14:39 +08:00
Tõnis Tiigi
5ad6259537 Merge pull request #29546 from cpuguy83/29505_fix_overay2_check_plugin
Ensure test graphdriver plugin runs on test host
Upstream-commit: 288e55c09b252e02b5201e7d2f2bf45a323d8105
Component: engine
2016-12-19 16:16:42 -08:00
Tibor Vass
6c8c837c0c Merge pull request #29246 from thaJeztah/improve-swarm-check-in-inspect
Ignore certificate expiry error for top-level inspect
Upstream-commit: 77dde3efa7934959a762781ed42a64c70f49b9c2
Component: engine
2016-12-19 15:37:53 -08:00
Tõnis Tiigi
ae0f2c64b3 Merge pull request #29339 from dmcgowan/plugins-abstract-download-manager
Abstract layerstore from pull/push distribution code
Upstream-commit: aecb79ff9866ec6b3536c50608706d2d4a6325df
Component: engine
2016-12-19 13:32:28 -08:00
Brian Goff
cafaf16a79 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>
Upstream-commit: e4ebc92edc85d2f46cf41c4ad9514ba0fbafed06
Component: engine
2016-12-19 16:05:22 -05:00
Sebastiaan van Stijn
b95defdddf Merge pull request #29551 from albers/completion-remove-daemon
Remove bash completion for deprecated `docker daemon`
Upstream-commit: db5159b78d2e519b7c168afa8136417ae99e5765
Component: engine
2016-12-19 20:52:13 +01:00
Harald Albers
a9e33d7f0c Remove bash completion for deprecated docker daemon
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 536a9ec698b8a2f51102b2c57cd9c675873b9af4
Component: engine
2016-12-19 11:40:59 -08:00
Tõnis Tiigi
7648808bef Merge pull request #29522 from codevulture/master
Change -tlsverify to --tlsverify in warning
Upstream-commit: 5add856be6411f776556f85b9e3ef17049de043e
Component: engine
2016-12-19 11:11:17 -08:00
Derek McGowan
c162add86f 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>
Upstream-commit: 3c7676a057a4c0103895f793e407dc6736df139a
Component: engine
2016-12-19 10:55:00 -08:00
Derek McGowan
27d800b3f4 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>
Upstream-commit: 61ac7c4bf8336ff7308d2693bdafd3667690aa97
Component: engine
2016-12-19 10:54:55 -08:00
Alexander Morozov
fde61754e9 commit: do not change container labels on commit
Fix #29547

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ca6c6f0765aeccdb2730d03c05bd965906df8cd4
Component: engine
2016-12-19 09:56:20 -08:00
Sebastiaan van Stijn
4486744b4b Merge pull request #26576 from allencloud/change-cluster-response-status-code
update response status code for cluster request
Upstream-commit: a58b5830b175860e71174c93c6f3ec1cefcd5e0d
Component: engine
2016-12-19 18:31:45 +01:00
Vincent Demeester
d696b498fb Merge pull request #29513 from thaJeztah/fix-anonymous-volumes
fix conversion of anonymous volumes in compose-file
Upstream-commit: 38886bbd7468b72baea218882ac5332bede52176
Component: engine
2016-12-19 17:16:00 +01:00
Sebastiaan van Stijn
c539597e62 Merge pull request #29539 from vdemeester/integration-remove-workingdir
[test-integration] global variable workingDirectory is not needed…
Upstream-commit: d477a24ec54caee49d41e64b46d92ace6af48ffc
Component: engine
2016-12-19 15:18:02 +01:00
Sebastiaan van Stijn
26f1b9168f Merge pull request #29543 from EnergyLiYN/br2
Header has incorrect punctuation.
Upstream-commit: fc5b5a4d1b838cb6ee0eb64db8898d201a4fb556
Component: engine
2016-12-19 14:54:51 +01:00
Vincent Demeester
ad939616ff Merge pull request #29541 from tim-zju/spellError
spell error: in other parts, they are lower-case
Upstream-commit: 8a41c1d548835afcc5f6021f15e0c885ed99ef7c
Component: engine
2016-12-19 14:48:31 +01:00
lyn
61d2517256 Header has incorrect punctuation.
Signed-off-by: lyn <energylyn@zju.edu.cn>
Upstream-commit: c2ff923907bc77fdaaae8b4e44cddf0482727a52
Component: engine
2016-12-19 21:38:59 +08:00
janonymous
8534bae85a Change -tlsverify to --tlsverify (Bug Fix: #29521)
Signed-off-by: Jaivish Kothari <janonymous.codevulture@gmail.com>
Upstream-commit: f25e5ceeca74107f7860556a94f05ed61a5442f2
Component: engine
2016-12-19 18:03:57 +05:30
Evelyn.Xu
89240fcdc4 correct the spelling error of driver (#29523)
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 054e479bfae694194d40b4b68c63e5819a436b29
Component: engine
2016-12-19 07:33:36 -05:00
Vincent Demeester
c3b264f4f3 Global variable workingDirectory is not needed…
… and given where it was used, it should be quicker to create an empty
folder instead of passing potentially a big context with unrelated file.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3dd25b97902e064f43d56632d3a72768e36eecc5
Component: engine
2016-12-19 13:25:11 +01:00
Vincent Demeester
0a2ba8aaae Merge pull request #29378 from aaronlehmann/swarm-plugins
Support v2 plugins in swarm mode
Upstream-commit: eb59c6d587ab5d3a49f044b4399046c0979bd1af
Component: engine
2016-12-19 11:07:06 +01:00
Sebastiaan van Stijn
dc9d0b15f7 Merge pull request #29373 from vdemeester/remove-daemon-fmt-flood
Remove some fmt.Printf from integration-cli/daemon…
Upstream-commit: 48f7388e92f1b395728641059711c01662baf6da
Component: engine
2016-12-19 10:59:25 +01:00
Vincent Demeester
a00daba226 Merge pull request #29441 from coolljt0725/fix_update_restart_policy
Fix docker update clear restart policy of monitor
Upstream-commit: 0f68ecd3f72ab336ffb6117ca9e9add9499309cf
Component: engine
2016-12-19 10:30:04 +01:00
lixiaobing10051267
0fd4d2ba16 Use wrong ApplyLayer in diff_windows.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 9501f2ea978bf13d2f050f31223b15fad5b26622
Component: engine
2016-12-19 17:21:18 +08:00
Sebastiaan van Stijn
6bbfbe0423 Merge pull request #29393 from lixiaobing10051267/masterDockerUpdate
Add docker-update description ommitted in docker.1.md
Upstream-commit: 616adf1799af9a4815f74e39aabe4b2e352919c2
Component: engine
2016-12-19 10:17:14 +01:00
Vincent Demeester
55338a0e87 Merge pull request #29510 from albers/docs-remove-node-ps--all
Remove `--all|-a` from `docker node ps` reference
Upstream-commit: 309df6a59217852a8f1b14504ba064bbefb4727d
Component: engine
2016-12-19 09:31:43 +01:00
lixiaobing10051267
0bd3a53491 Add docker-update description ommited in docker.1.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: c499ce266a86aaf7d3d0e45bac8e833bad5df126
Component: engine
2016-12-19 15:13:51 +08:00
tim-zju
490fa1ab01 spell error: in other parts, they are lower-case
Signed-off-by: tim-zju <21651152@zju.edu.cn>
Upstream-commit: 4bf9e7caaa31035904529ee6305921821b5aa207
Component: engine
2016-12-19 13:05:11 +08:00
allencloud
4a0adf4beb update response status code for cluster request
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 29d4a7f512e3702ee4a2871dd84e3b24dd26477d
Component: engine
2016-12-19 10:21:10 +08:00
Michael
0fa3af8470 [docs,man] Fixed typo (#29516)
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
Upstream-commit: e85bb788de950090c66e8501d294bd8b5e4e4723
Component: engine
2016-12-18 19:55:09 -05:00
Sebastiaan van Stijn
1ad841b29e Improve validation for volume specs
The current validation only checked for the
number of elements in the volume-spec, however,
did not validate if the elements were empty.

Because of this, an empty volume-spec (""),
or volume spec only containing separators ("::")
would not be invalidated.

This adds a simple check for empty elements in
the volume-spec, and returns an error if
the spec is invalid.

A unit-test is also added to verify the behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 120241937e67238fd98b839886751bda70129ba8
Component: engine
2016-12-19 01:50:08 +01:00
Sebastiaan van Stijn
55f7b33245 Merge pull request #29497 from yongtang/29486-docker-build-tmp-file
Clean up tmp files for interrupted `docker build`
Upstream-commit: 6138a02c8739045a2f6dec85fd0d89db9bed43e5
Component: engine
2016-12-18 23:59:00 +01:00
Sebastiaan van Stijn
a9cbc77334 fix conversion of anonymous volumes in compose-file
the `convertVolumeToMount()` function did not take
anonymous volumes into account when converting
volume specifications to bind-mounts.

this resulted in the conversion to try to
look up an empty "source" volume, which
lead to an error;

    undefined volume:

this patch distinguishes "anonymous"
volumes from bind-mounts and named-volumes,
and skips further processing if no source
is defined (i.e. the volume is "anonymous").

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 34889e579f89e389743c35e935709b204bf45bf4
Component: engine
2016-12-18 16:50:32 +01:00
Harald Albers
46f764687c Remove --all|-a from docker node ps reference
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 364e9002375fca1799180dd76e8074d922dd4044
Component: engine
2016-12-18 06:47:54 -08:00
Harald Albers
a931db0d48 Remove bash completion for docker node ps --all|-a
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a54cc4f88da67175938ac2a3d643e3de6cb4d4de
Component: engine
2016-12-18 06:31:25 -08:00
Sebastiaan van Stijn
2b846c8a06 Merge pull request #28629 from yongtang/28581-secret-create-input
Add `--file` flag for `docker secret create` command
Upstream-commit: 4436a5946d1cc20efb3af5a3d0c56894c02f1a29
Component: engine
2016-12-18 03:04:10 +01:00
Sebastiaan van Stijn
214ffb7a47 Merge pull request #28160 from AkihiroSuda/update-experimental-md
update experimental/README.md
Upstream-commit: f6ba8498a2ecd037bf3e42f27c009768ac9f9384
Component: engine
2016-12-18 03:02:07 +01:00
Sebastiaan van Stijn
bb420234b1 Merge pull request #29494 from thaJeztah/fix-powershell-dco-check
fix powershell dco check
Upstream-commit: ee88de7385e374b05feaa510107513fbffbf3aad
Component: engine
2016-12-17 21:34:51 +01:00
Sebastiaan van Stijn
8616ae37b9 Merge pull request #29423 from unclejack/api_cli_integ_return
return directly without ifs in remaining packages
Upstream-commit: 21210419447281863f239805ab19248733041a52
Component: engine
2016-12-17 21:30:47 +01:00