Commit Graph

4514 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 1cd402b192 Merge pull request #360 from akalipetis/compose-update-order
Add support for update order in compose deployments
2017-08-01 22:24:48 +02:00
Vincent Demeester 772956b263 Merge pull request #404 from thaJeztah/fix-port-presentation
Fix presentation of published "random" host ports
2017-08-01 21:31:46 +02:00
Sebastiaan van Stijn fd6523e21f Merge pull request #381 from albers/completion-login-fix-sort-order
Fix sort order of options in bash completion
2017-08-01 21:26:46 +02:00
Sebastiaan van Stijn ceb18a841a
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>
2017-08-01 19:21:17 +02:00
Vincent Demeester c6e497d15c Merge pull request #403 from Zebrilee/fix-issue-159
update service create and update options in commandline documentation
2017-08-01 14:08:29 +02:00
Vincent Demeester f386d476ba Merge pull request #388 from christopherobin/feature/stopsignal
Add support for stop-signal in stack command
2017-08-01 09:53:13 +02:00
zebrilee 5fe09164f5 update service create and update options in commandline documentation
Signed-off-by: zebrilee <zebrilee@gmail.com>
2017-07-31 23:26:02 +02:00
Sebastiaan van Stijn f47d9803fd Merge pull request #399 from Zebrilee/fix-issue-253
modify foo by container in order to clarify the documentation
2017-07-31 10:40:08 -07:00
Sebastiaan van Stijn 7ac1db2f8f Merge pull request #393 from thaJeztah/add-missing-is-task-filter
Docs: update filter options for docker container ps
2017-07-31 09:51:13 +01:00
zebrilee 2d5f9d83e7 modify foo by container in order to clarify the documentation
Signed-off-by: zebrilee <zebrilee@gmail.com>
2017-07-29 20:44:50 +02:00
Antonis Kalipetis 2950667f07
Support the "order" key in "update_config" for compose
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2017-07-28 22:50:55 +03:00
Sebastiaan van Stijn 286216dbc3 Merge pull request #396 from kolyshkin/fix-repo-ref
Fix repo references in docs
2017-07-28 19:37:10 +01:00
Riyaz Faizullabhoy fedbc5861b Add Contribution guidelines
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-07-28 11:33:19 -07:00
Kir Kolyshkin 6d85a4f5f8 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>
2017-07-28 10:32:42 -07:00
Sebastiaan van Stijn eed14e840c Merge pull request #387 from darrenstahlmsft/saveFastFail
Fast fail when save directory does not exist
2017-07-28 17:46:13 +01:00
Harald Albers 548758fe31 bash completion for `service ps` supports multiple services
Signed-off-by: Harald Albers <github@albersweb.de>
2017-07-28 15:43:34 +02:00
Sebastiaan van Stijn 75249123b1 Merge pull request #306 from lipingxue/new_compose_fix.liping
Make compose file allow to specify names for non-external volume
2017-07-28 00:35:44 +02:00
Liping Xue 27a3080825 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>
2017-07-27 15:09:05 -07:00
Darren Stahl 18c877d35c Fast fail when save directory does not exist
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-07-27 15:00:38 -07:00
Sebastiaan van Stijn 46064f33f4
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>
2017-07-27 22:10:26 +02:00
Harald Albers 1862ac1e63 Add support for redirections in bash completion for `docker save|load`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-07-27 14:45:15 +02:00
Harald Albers abc793e333 Add file completion to bash completion for `secret create`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-07-27 14:44:12 +02:00
Harald Albers 29d0f868e8 Add bash completion for `service scale --detach`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-07-27 14:43:24 +02:00
Harald Albers 393dc4a8c4 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>
2017-07-27 14:38:27 +02:00
Jean-Pierre Huynh 04d905f6fa Add zsh completion for `docker service scale --detach=false`
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
2017-07-27 07:48:39 +01:00
Christophe Robin b129a70b5c
Add support for stop-signal in stack command
Signed-off-by: Christophe Robin <crobin@nekoo.com>
2017-07-27 13:18:05 +09:00
Daniel Nephin 12a7387c8e Add a warning when make is run outside of a container.
The warning can be disabled by setting the environment variable

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-07-26 15:58:15 -04:00
Daniel Nephin 2dac00bdca Merge pull request #319 from keloyang/bugfix-docker-cp
Bugfix docker cp
2017-07-26 11:56:12 -04:00
Sebastiaan van Stijn 915b18bdc9 Merge pull request #379 from jphuynh/completion-zsh-plugin-ls-filter
Add metric plugins to zsh completion for `plugin ls --filter capability`
2017-07-25 20:02:26 +02:00
Jean-Pierre Huynh ff61438328 Add metric plugins to zsh completion for `plugin ls --filter capability`
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
2017-07-25 09:24:35 +01:00
Sebastiaan van Stijn 7cf9e752d5 Merge pull request #375 from hernandanielg/doc/fix_volume_ls
fixed word network on volume_ls.md
2017-07-25 03:05:37 +02:00
Sebastiaan van Stijn 4c30fbcf4c Merge pull request #371 from jphuynh/completion-zsh-service-create-update-publish
Remove duplicate publish option in docker service create/update
2017-07-25 02:54:05 +02:00
Hernan Garcia f5bca7af10 fixed word network on volume_ls.md
Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>
2017-07-24 05:18:10 -05:00
Sebastiaan van Stijn 1338f11ee7 Merge pull request #374 from thaJeztah/bump-version
Bump version to 17.08.0-dev
2017-07-24 01:03:20 +02:00
Sebastiaan van Stijn a8bcbfd9e0
Bump version to 17.08.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-22 03:13:52 +02:00
Sebastiaan van Stijn deab50ba19 Merge pull request #363 from jphuynh/shellcheckReadme
Update README and add help target to make
2017-07-22 03:06:53 +02:00
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