Commit Graph

4384 Commits

Author SHA1 Message Date
763e45c80b Merge pull request #427 from vdemeester/import-templates-from-docker-pkg
Import templates from docker pkg
Upstream-commit: f3c325f390
Component: cli
2017-08-08 11:55:58 -04:00
e6ade3ec40 Re-run vndr on docker/docker to remove pkg/templates
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 680c827075
Component: cli
2017-08-08 17:26:30 +02:00
d19b8b0269 Import docker/docker/pkg/templates to cli
This package will be deprecated/removed from `docker/docker/pkg` and
is mainly used for the cli format options. Let's import it and
maintain here.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a6800f95fa
Component: cli
2017-08-08 17:26:24 +02:00
bee0cb9a32 Merge pull request #413 from albers/completion-build--target
Add bash completion for `docker build --target`
Upstream-commit: 227e042ff0
Component: cli
2017-08-07 12:41:03 -07:00
fd8ca099c7 Merge pull request #419 from thaJeztah/easier-testing-in-container
Add "build" dir to PATH in dev-container
Upstream-commit: e0f1e4d5d7
Component: cli
2017-08-07 16:25:19 +02:00
d65ac7e37d Merge pull request #378 from riyazdf/contributing-doc
Add Contribution guidelines doc
Upstream-commit: 056739abfe
Component: cli
2017-08-07 13:27:31 +02:00
aac72d07e3 Merge pull request #423 from albers/docs-fix-invalid-plugins
Fix invalid plugin references in docs
Upstream-commit: eb4672c149
Component: cli
2017-08-07 12:53:44 +02:00
48c6aae018 Fix invalid plugin references in docs
The plugins `tiborvass/sample-volume-plugins` and `tiborvass/no-remove`
do not exist.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2dca576a4c
Component: cli
2017-08-07 11:15:39 +02:00
0d587285b1 Add "build" dir to PATH in dev-container
This makes running the client easier inside
the container; allowing to use just `docker`
instead of `build/docker`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7a0b49df23
Component: cli
2017-08-05 03:24:21 +02:00
6611cd0751 Merge pull request #415 from jlhawn/client_dial_enable_tcp_keepalive
Enable TCP Keep-Alive in Docker client
Upstream-commit: f7b78dc137
Component: cli
2017-08-03 19:42:57 +02:00
9d3d3a9756 Merge pull request #411 from mstanleyjones/add-infinit
Add Infinit plugin
Upstream-commit: 7e2b0708a4
Component: cli
2017-08-03 17:34:07 +02:00
37d6377fa6 Enable TCP Keep-Alive in Docker client
Some network environments may have NATs, proxies, or gateways which
kill idle connections. There are many Docker API operations which may
be idle for long periods of time (such as ContainerWait and ContainerAttach)
and may result in unexpected connection closures or hangs if TCP keepalives
are not used.

This patch updates the default HTTP transport used by the Docker client
package to enable TCP Keep-Alive with a keep-alive interval of 30 seconds.
It also sets a connect timeout of 30 seconds.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 2831a04cba
Component: cli
2017-08-02 14:35:03 -07:00
13565d88c2 Merge pull request #334 from albers/completion--storage-opt-dm.libdm_log_level
Add bash completion for `--storage-opt dm.libdm_log_level`
Upstream-commit: 68c27d7347
Component: cli
2017-08-02 18:18:02 +02:00
9f8f247e20 Merge pull request #395 from albers/completion-service-ps-multiple
bash completion for `service ps` supports multiple services
Upstream-commit: c4d705fa7f
Component: cli
2017-08-02 18:16:02 +02:00
fe03ca4a16 Merge pull request #384 from albers/completion-redirections
Add support for redirections in bash completion for `docker save|load`
Upstream-commit: 41a9507250
Component: cli
2017-08-02 18:15:24 +02:00
93670daa92 Add bash completion for docker build --target
`--file` and `PATH` are honored if the are specified before `--target`.
Note that according to the command's syntax, PATH should be specified
after the options.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 647166b3bf
Component: cli
2017-08-02 16:49:01 +02:00
a8778a8f6e Merge pull request #405 from beenanner/patch-1
Fix missing missing backtick in documentation for node ls
Upstream-commit: b0cc841631
Component: cli
2017-08-02 08:58:53 +02:00
2a797862f7 Fix missing missing backtick
Signed-off-by: Jonathan Lee <jonjohn1232009@gmail.com>
Upstream-commit: 9e4ad4889e
Component: cli
2017-08-01 20:45:43 -04:00
593d56a228 Add Infinit plugin
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 83e8551876
Component: cli
2017-08-01 15:50:42 -07:00
7c57a40cf0 Merge pull request #382 from albers/completion-service-scale--detach
Add bash completion for `service scale --detach`
Upstream-commit: a74e2135e4
Component: cli
2017-08-02 00:49:18 +02:00
d7c8e49652 Merge pull request #389 from jphuynh/zsh-scale-detach
Add zsh completion for `docker service scale --detach=false`
Upstream-commit: dabfec6dde
Component: cli
2017-08-02 00:48:37 +02:00
197321de78 Merge pull request #383 from albers/improve-completion-secret-create
Add file completion to bash completion for `secret create`
Upstream-commit: 2ae9276995
Component: cli
2017-08-02 00:45:24 +02:00
ef1dcf60fa Merge pull request #360 from akalipetis/compose-update-order
Add support for update order in compose deployments
Upstream-commit: 1cd402b192
Component: cli
2017-08-01 22:24:48 +02:00
1ee9153d20 Merge pull request #404 from thaJeztah/fix-port-presentation
Fix presentation of published "random" host ports
Upstream-commit: 772956b263
Component: cli
2017-08-01 21:31:46 +02:00
8bb0430472 Merge pull request #381 from albers/completion-login-fix-sort-order
Fix sort order of options in bash completion
Upstream-commit: fd6523e21f
Component: cli
2017-08-01 21:26:46 +02:00
070da803ab Fix presentation of published "random" host ports
Ports that were picked from the ephemeral port range
were presented as `*:0->80/tcp`.

This patch changes the presentation to use the
actually assigned port, instead of the port specified
in `Endpoint.Spec` (which is always empty/zero (`0`))

Before this change;

    ID                  NAME                MODE                REPLICAS            IMAGE               PORTS
    5d44i665qj66        with-random-port    replicated          1/1                 nginx:alpine        *:0->80/tcp

After this change;

    ID                  NAME                MODE                REPLICAS            IMAGE               PORTS
    5d44i665qj66        with-random-port    replicated          1/1                 nginx:alpine        *:30000->80/tcp

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ceb18a841a
Component: cli
2017-08-01 19:21:17 +02:00
4310c5e46a Merge pull request #403 from Zebrilee/fix-issue-159
update service create and update options in commandline documentation
Upstream-commit: c6e497d15c
Component: cli
2017-08-01 14:08:29 +02:00
b6625098a8 Merge pull request #388 from christopherobin/feature/stopsignal
Add support for stop-signal in stack command
Upstream-commit: f386d476ba
Component: cli
2017-08-01 09:53:13 +02:00
97a283fbdb update service create and update options in commandline documentation
Signed-off-by: zebrilee <zebrilee@gmail.com>
Upstream-commit: 5fe09164f5
Component: cli
2017-07-31 23:26:02 +02:00
db556c6449 Merge pull request #399 from Zebrilee/fix-issue-253
modify foo by container in order to clarify the documentation
Upstream-commit: f47d9803fd
Component: cli
2017-07-31 10:40:08 -07:00
540600c393 Merge pull request #393 from thaJeztah/add-missing-is-task-filter
Docs: update filter options for docker container ps
Upstream-commit: 7ac1db2f8f
Component: cli
2017-07-31 09:51:13 +01:00
05235298ea modify foo by container in order to clarify the documentation
Signed-off-by: zebrilee <zebrilee@gmail.com>
Upstream-commit: 2d5f9d83e7
Component: cli
2017-07-29 20:44:50 +02:00
7fbda78591 Support the "order" key in "update_config" for compose
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
Upstream-commit: 2950667f07
Component: cli
2017-07-28 22:50:55 +03:00
74a1718a1b Merge pull request #396 from kolyshkin/fix-repo-ref
Fix repo references in docs
Upstream-commit: 286216dbc3
Component: cli
2017-07-28 19:37:10 +01:00
3a677ada11 Add Contribution guidelines
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: fedbc5861b
Component: cli
2017-07-28 11:33:19 -07:00
c16c5f3db8 Fix repo references in docs
Since CLI was moved to a separate repo, these references are incorrect.
Fixed with the help of sed script, verified manually.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 6d85a4f5f8
Component: cli
2017-07-28 10:32:42 -07:00
236f3097a5 Merge pull request #387 from darrenstahlmsft/saveFastFail
Fast fail when save directory does not exist
Upstream-commit: eed14e840c
Component: cli
2017-07-28 17:46:13 +01:00
2a26081729 bash completion for service ps supports multiple services
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 548758fe31
Component: cli
2017-07-28 15:43:34 +02:00
06bc641d46 Merge pull request #306 from lipingxue/new_compose_fix.liping
Make compose file allow to specify names for non-external volume
Upstream-commit: 75249123b1
Component: cli
2017-07-28 00:35:44 +02:00
337a036e64 Change to enable volume name can be customized.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Change to enable volume name can be customized.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Change to enable volume name can be customized.

Remove unused debug info.

Address comments from Daniel and solve the lint error.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to print warning message when name of external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Remove the case that specifying external volume name in full-example.yml.

More fix.

Add unit test.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Daniel, move the schema change to v3.4.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Sebastiaan. Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Misty.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Upstream-commit: 27a3080825
Component: cli
2017-07-27 15:09:05 -07:00
3c0b1df0ba Fast fail when save directory does not exist
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 18c877d35c
Component: cli
2017-07-27 15:00:38 -07:00
ba32b46d68 Docs: update filter options for docker container ps
The `is-task` filter was only documented in the usage
section, but this section is not used in the documentation.

This patch adds the missing filter, synchronises the
man page source, and does some slight rephrasing
and reformatting of the filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 46064f33f4
Component: cli
2017-07-27 22:10:26 +02:00
05b4b48f44 Add support for redirections in bash completion for docker save|load
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1862ac1e63
Component: cli
2017-07-27 14:45:15 +02:00
bb26636fb0 Add file completion to bash completion for secret create
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: abc793e333
Component: cli
2017-07-27 14:44:12 +02:00
eb0bdbb81b Add bash completion for service scale --detach
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 29d0f868e8
Component: cli
2017-07-27 14:43:24 +02:00
4fc5710ae5 Fix sort order of options in bash completion
See guidelines at the top of the script:

    # Note for developers:
    # Please arrange options sorted alphabetically by long name with the
    # short options immediately following their corresponding long form.
    # This order should be applied to lists, alternatives and code blocks.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 393dc4a8c4
Component: cli
2017-07-27 14:38:27 +02:00
36e04981d5 Add zsh completion for docker service scale --detach=false
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 04d905f6fa
Component: cli
2017-07-27 07:48:39 +01:00
5e49f90082 Add support for stop-signal in stack command
Signed-off-by: Christophe Robin <crobin@nekoo.com>
Upstream-commit: b129a70b5c
Component: cli
2017-07-27 13:18:05 +09:00
88060164f5 Merge pull request #319 from keloyang/bugfix-docker-cp
Bugfix docker cp
Upstream-commit: 2dac00bdca
Component: cli
2017-07-26 11:56:12 -04:00
a2ee6302a8 Merge pull request #379 from jphuynh/completion-zsh-plugin-ls-filter
Add metric plugins to zsh completion for `plugin ls --filter capability`
Upstream-commit: 915b18bdc9
Component: cli
2017-07-25 20:02:26 +02:00