Commit Graph

4276 Commits

Author SHA1 Message Date
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
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
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
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
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
77f384f48b Add metric plugins to zsh completion for plugin ls --filter capability
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: ff61438328
Component: cli
2017-07-25 09:24:35 +01:00
706203d338 Merge pull request #375 from hernandanielg/doc/fix_volume_ls
fixed word network on volume_ls.md
Upstream-commit: 7cf9e752d5
Component: cli
2017-07-25 03:05:37 +02:00
57e5f69d28 Merge pull request #371 from jphuynh/completion-zsh-service-create-update-publish
Remove duplicate publish option in docker service create/update
Upstream-commit: 4c30fbcf4c
Component: cli
2017-07-25 02:54:05 +02:00
c394e66cf8 fixed word network on volume_ls.md
Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>
Upstream-commit: f5bca7af10
Component: cli
2017-07-24 05:18:10 -05:00
04720d7b97 Bump version to 17.08.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a8bcbfd9e0
Component: cli
2017-07-22 03:13:52 +02:00
51a3e0949b Merge pull request #363 from jphuynh/shellcheckReadme
Update README and add help target to make
Upstream-commit: deab50ba19
Component: cli
2017-07-22 03:06:53 +02:00
c6ce3f3302 Update README and add help target to make
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 649a5864f3
Component: cli
2017-07-21 16:57:06 +01:00
53b038fa76 Error if "until" filter is combined with "--volumes" on system prune
The "until" filter is supported by all object types, except for
volumes.

Before this patch, the "until" filter would attempted to be used for the volume
prune endpoint, resulting in an error being returned by the daemon, and
further prune endpoints (networks, images) to be skipped.

    $ docker system prune --filter until=24h --filter label=label.foo=bar

    WARNING! This will remove:
            - all stopped containers
            - all volumes not used by at least one container
            - all networks not used by at least one container
            - all dangling images
    Are you sure you want to continue? [y/N] y
    Error response from daemon: Invalid filter 'until'

    Calling POST /v1.30/containers/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D
    Calling POST /v1.30/volumes/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D
    Handler for POST /v1.30/volumes/prune returned error: Invalid filter 'until'
    Error response from daemon: Invalid filter 'until'

With this patch, an error is produced instead, preventing "partial" prune.

    $ docker system prune --filter until=24h --filter label=foo==bar --volumes
    ERROR: The "until" filter is not supported with "--volumes"

Note that `docker volume prune` does not have this problem, and produces an
error if the `until` filter is used;

    $ docker volume prune --filter until=24h

    WARNING! This will remove all volumes not used by at least one container.
    Are you sure you want to continue? [y/N] y
    Error response from daemon: Invalid filter 'until'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3c095dc546
Component: cli
2017-07-21 12:11:53 +02:00
98b6afc061 Merge pull request #369 from jphuynh/completion-zsh-get-log-options
Update __docker_get_log_options completion (zsh)
Upstream-commit: 33a25708d4
Component: cli
2017-07-21 11:25:17 +02:00
9c4647a2a3 Merge pull request #368 from jphuynh/completion-zsh-system-prune-volumes
Add zsh completion for `system prune --volumes`
Upstream-commit: 814827ef0d
Component: cli
2017-07-21 11:20:59 +02:00
4ea813dca9 Merge pull request #364 from ksouf/issue-37-add-connect-disconnect
adding connect disconnect network tests
Upstream-commit: 36b9edff7e
Component: cli
2017-07-21 11:19:23 +02:00
96839aeeb6 Merge pull request #223 from ripcurld0/docs_cp_prm
Update the cp command docs to include archive
Upstream-commit: 25ca529388
Component: cli
2017-07-21 11:14:15 +02:00
a6804951ed Merge pull request #291 from thaJeztah/bump-swarmkit
Bump swarmkit and dependencies to 79381d0840be27f8b3f5c667b348a4467d866eeb
Upstream-commit: 472ce90624
Component: cli
2017-07-21 11:07:38 +02:00
49215da962 Remove duplicate publish option in docker service create/update completion
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 6c65ba6c08
Component: cli
2017-07-21 09:53:43 +01:00
6adc7715ee Update __docker_get_log_options completion
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: d7ade64d29
Component: cli
2017-07-20 23:41:47 +01:00
a3b41349c5 Add zsh completion for system prune --volumes
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 6b256484ae
Component: cli
2017-07-20 23:13:04 +01:00
1dd2821aa2 Merge pull request #357 from ripcurld0/nat_sort_service
Sort services names in a natural order
Upstream-commit: dfbad2bc5a
Component: cli
2017-07-20 22:56:09 +02:00
69533b66d7 adding connect disconnect network tests
Signed-off-by: khaled souf <khaled.souf@gmail.com>
Upstream-commit: 7296abf39f
Component: cli
2017-07-20 18:53:03 +02:00
384f10f42e Fix shellcheck on master
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 14d2c95d4a
Component: cli
2017-07-20 12:11:27 -04:00
0d67981907 Add myself to command/stack codeowners
Cleanup a test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 60991e943b
Component: cli
2017-07-20 12:05:20 -04:00
e02dded93f Merge pull request #281 from albers/completion-plugin-ls--filter-capability
Add metric plugins to bash completion for `plugin ls --filter capability`
Upstream-commit: 45a7e1ca87
Component: cli
2017-07-20 13:39:51 +02:00
23caa8b756 Merge pull request #280 from albers/completion-awslog-multiline
Add bash completion for awslogs multiline log driver options
Upstream-commit: ab05e0aa63
Component: cli
2017-07-20 13:39:10 +02:00
c4357dce36 Merge pull request #332 from tych0/docs-fixups-for-password-stdin
Docs fixups for password stdin
Upstream-commit: 3d76febd17
Component: cli
2017-07-20 11:31:23 +02:00
4a278a582f Merge pull request #279 from albers/completion-build--iidfile
Add bash completion for `build --iidfile`
Upstream-commit: c394cd9bb7
Component: cli
2017-07-20 09:57:05 +02:00
39842a2345 Merge pull request #284 from albers/completion-service--detach
Fix bash completion for `service create|update --detach|-d`
Upstream-commit: cc6867f456
Component: cli
2017-07-20 09:47:59 +02:00
381747626c Merge pull request #283 from albers/completion-configs
Add bash completion for `docker config` command family
Upstream-commit: a4d76989bd
Component: cli
2017-07-20 09:45:01 +02:00
82bb6886df Skip inspects of built-in networks on stack deploy
Signed-off-by: Alex Mavrogiannis <alex.mavrogiannis@docker.com>
Upstream-commit: 7f53c99dfe
Component: cli
2017-07-19 19:39:44 -07:00
0de63ac93f Add Compose format 3.4
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0adccacb38
Component: cli
2017-07-19 14:24:59 -07:00
c04822c682 Sort services names in a natural order
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 7478e47b2d
Component: cli
2017-07-19 18:18:06 +03:00
e4c6e38322 Fix CODEOWNERS patterns.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cea8b4f4f3
Component: cli
2017-07-18 18:25:55 -04:00
70f1e387d9 fish completion: add --password-stdin
Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: 3b7b6b5f7f
Component: cli
2017-07-18 15:25:46 -06:00
231e3a605b zsh completion: add --password-stdin
Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: 90619e5054
Component: cli
2017-07-18 15:25:46 -06:00
3ddb21c1b1 bash completion: add --password-stdin
Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: bbfe23f9e6
Component: cli
2017-07-18 15:25:46 -06:00
9fab9786f4 docs: add --password-stdin
also add an example of usage

Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: 3e392505a8
Component: cli
2017-07-18 15:25:46 -06:00
7c2dc55ca3 Remove unnecessary prune function aliases.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ff350a04cb
Component: cli
2017-07-18 12:25:45 -04:00