Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,478 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

4478 Commits

Author SHA1 Message Date
Sebastiaan van Stijn b175e3aacd Merge pull request #311 from thaJeztah/fix-system-prune-until 
Error if "until" filter is combined with "--volumes" on system prune
 2017-07-22 03:04:58 +02:00
Jean-Pierre Huynh 649a5864f3 Update README and add help target to make 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 2017-07-21 16:57:06 +01:00
Sebastiaan van Stijn 3c095dc546
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>
 2017-07-21 12:11:53 +02:00
Vincent Demeester 33a25708d4 Merge pull request #369 from jphuynh/completion-zsh-get-log-options 
Update __docker_get_log_options completion (zsh)
 2017-07-21 11:25:17 +02:00
Vincent Demeester 814827ef0d Merge pull request #368 from jphuynh/completion-zsh-system-prune-volumes 
Add zsh completion for `system prune --volumes`
 2017-07-21 11:20:59 +02:00
Vincent Demeester 36b9edff7e Merge pull request #364 from ksouf/issue-37-add-connect-disconnect 
adding connect disconnect network tests
 2017-07-21 11:19:23 +02:00
Sebastiaan van Stijn 25ca529388 Merge pull request #223 from ripcurld0/docs_cp_prm 
Update the cp command docs to include archive
 2017-07-21 11:14:15 +02:00
Vincent Demeester 472ce90624 Merge pull request #291 from thaJeztah/bump-swarmkit 
Bump swarmkit and dependencies to 79381d0840be27f8b3f5c667b348a4467d866eeb
 2017-07-21 11:07:38 +02:00
Jean-Pierre Huynh 6c65ba6c08 Remove duplicate publish option in docker service create/update completion 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 2017-07-21 09:53:43 +01:00
Jean-Pierre Huynh d7ade64d29 Update __docker_get_log_options completion 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 2017-07-20 23:41:47 +01:00
Jean-Pierre Huynh 6b256484ae Add zsh completion for `system prune --volumes` 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 2017-07-20 23:13:04 +01:00
Sebastiaan van Stijn dfbad2bc5a Merge pull request #357 from ripcurld0/nat_sort_service 
Sort services names in a natural order
 2017-07-20 22:56:09 +02:00
khaled souf 7296abf39f adding connect disconnect network tests 
Signed-off-by: khaled souf <khaled.souf@gmail.com>
 2017-07-20 18:53:03 +02:00
Sebastiaan van Stijn eabdace628 Merge pull request #365 from dnephin/more-codeowners 
Fix shellcheck on master and other cleanup
 2017-07-20 18:35:09 +02:00
Daniel Nephin 14d2c95d4a Fix shellcheck on master 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-20 12:11:27 -04:00
Daniel Nephin 60991e943b Add myself to command/stack codeowners 
Cleanup a test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-20 12:05:20 -04:00
Sebastiaan van Stijn 45a7e1ca87 Merge pull request #281 from albers/completion-plugin-ls--filter-capability 
Add metric plugins to bash completion for `plugin ls --filter capability`
 2017-07-20 13:39:51 +02:00
Sebastiaan van Stijn ab05e0aa63 Merge pull request #280 from albers/completion-awslog-multiline 
Add bash completion for awslogs multiline log driver options
 2017-07-20 13:39:10 +02:00
Vincent Demeester 3d76febd17 Merge pull request #332 from tych0/docs-fixups-for-password-stdin 
Docs fixups for password stdin
 2017-07-20 11:31:23 +02:00
Vincent Demeester c394cd9bb7 Merge pull request #279 from albers/completion-build--iidfile 
Add bash completion for `build --iidfile`
 2017-07-20 09:57:05 +02:00
Vincent Demeester cc6867f456 Merge pull request #284 from albers/completion-service--detach 
Fix bash completion for `service create|update --detach|-d`
 2017-07-20 09:47:59 +02:00
Vincent Demeester a4d76989bd Merge pull request #283 from albers/completion-configs 
Add bash completion for `docker config` command family
 2017-07-20 09:45:01 +02:00
Sebastiaan van Stijn 79b6d376ce Merge pull request #362 from alexmavr/stack-host-bridge-nets 
Skip inspect of built-in networks on stack deploy
 2017-07-20 07:47:27 +02:00
Alex Mavrogiannis 7f53c99dfe Skip inspects of built-in networks on stack deploy 
Signed-off-by: Alex Mavrogiannis <alex.mavrogiannis@docker.com>
 2017-07-19 19:39:44 -07:00
Daniel Nephin 0adccacb38 Add Compose format 3.4 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-19 14:24:59 -07:00
Jean-Pierre Huynh 24c06c1723 Add scripts folder to shellcheck 
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 2017-07-19 16:33:58 +01:00
Boaz Shuster 7478e47b2d Sort services names in a natural order 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-07-19 18:18:06 +03:00
Victor Vieux 7f684c7512 Merge pull request #356 from dnephin/fix-codeowners 
Fix .github/CODEOWNERS patterns
 2017-07-18 17:08:37 -07:00
Daniel Nephin cea8b4f4f3 Fix CODEOWNERS patterns. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-18 18:25:55 -04:00
Tycho Andersen 3b7b6b5f7f fish completion: add --password-stdin 
Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-07-18 15:25:46 -06:00
Tycho Andersen 90619e5054 zsh completion: add --password-stdin 
Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-07-18 15:25:46 -06:00
Tycho Andersen bbfe23f9e6 bash completion: add --password-stdin 
Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-07-18 15:25:46 -06:00
Tycho Andersen 3e392505a8 docs: add --password-stdin 
also add an example of usage

Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-07-18 15:25:46 -06:00
Aaron Lehmann 257e113542 Merge pull request #351 from dnephin/misc-cleanup 
Misc cleanup of dockerfiles and circleci
 2017-07-18 10:44:51 -07:00
Daniel Nephin ff350a04cb Remove unnecessary prune function aliases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-18 12:25:45 -04:00
Daniel Nephin 0f91d9e6c4 Cleanup dockerfiles and circle 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-18 12:22:28 -04:00
Vincent Demeester a14762c6d2 Merge pull request #350 from thaJeztah/unexport-commands 
Unexport subcommands
 2017-07-18 17:17:01 +02:00
Daniel Nephin 3209cb8da6 Merge pull request #341 from thaJeztah/small-prune-refactor 
Small refactor in system prune
 2017-07-18 10:45:21 -04:00
Sebastiaan van Stijn 9c7b0d74cd
Unexport subcommands 
These commands were only used as subcommands, so did
not have to be exported.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-18 15:26:45 +02:00
Sebastiaan van Stijn 73163ee78b
Small refactor in system prune 
Adapt "image prune" and "build cache prune" to have
the same signature as the other prune commands, so
that they can all be added to the "pruneFuncs" array.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-18 15:13:11 +02:00
Sebastiaan van Stijn 79e4d635ca Merge pull request #315 from ripcurld0/nat_sort 
Sort swarm stacks and nodes using natural sorting
 2017-07-18 15:01:11 +02:00
Kenfe-Mickaël Laventure 19efbc85f4 Merge pull request #345 from vdemeester/remove-prune-package 
Remove useless prune package 👼
 2017-07-18 14:46:53 +02:00
Vincent Demeester b75596e1e4 Merge pull request #266 from jphuynh/shellcheck 
Add shellcheck for bash completion
 2017-07-18 09:59:07 +02:00
Vincent Demeester 3f4d91508e
Remove useless prune package 👼 
The `cli/command/prune` just does some aliasing of `Prune*` methods,
doesn't have any use.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-07-18 09:49:02 +02:00
Vincent Demeester 277f4b997c Merge pull request #340 from thaJeztah/fix-dont-prune-build-cache 
Fix: skip build-cache prune on unsupported versions
 2017-07-18 09:41:37 +02:00
Sebastiaan van Stijn 6c3a448ecb
Fix: skip build-cache prune on unsupported versions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-17 11:55:35 +02:00
Sebastiaan van Stijn 03a46a66bd Merge pull request #331 from yuexiao-wang/docker-search-filters 
Fix filters displaying for docker search
 2017-07-14 23:30:43 -07:00
Sebastiaan van Stijn 47370b4863 Merge pull request #314 from allencloud/add-filter-scope-for-events 
docs: add filter scope for command events and more cluster events
 2017-07-14 23:28:55 -07:00
Sebastiaan van Stijn 9c9fe9bf1f Merge pull request #338 from thaJeztah/carry-moby-32483 
Service privileges: CLI reference docs & completion
 2017-07-14 23:26:52 -07:00
Sebastiaan van Stijn 5cc7ac2990 Service privileges: CLI reference docs & completion 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-14 22:30:47 -07:00