Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,054 Commits 11 Branches 239 Tags 234 MiB
Commit Graph

5054 Commits

Author SHA1 Message Date
Vincent Demeester 250c3f0db2 Merge pull request #31621 from dnephin/cleanup-container-run-command 
Some cleanup of container run command
 2017-03-21 16:01:11 +01:00
Sebastiaan van Stijn e1409013e5 Merge pull request #31552 from ripcurld0/add_format_secretls 
Add format to secret ls
 2017-03-20 20:20:45 +01:00
Vincent Demeester 586412ce39 Merge pull request #31948 from vdemeester/compose-typo 
Fixing a small typo in compose loader package
 2017-03-20 17:48:50 +01:00
Daniel Nephin 749d8b2bdc Create a new ServerType struct for storing details about the server on the client. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-20 12:48:25 -04:00
Daniel Nephin 4ab8463fed Create a new ServerType struct for storing details about the server on the client. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-20 12:48:25 -04:00
Vincent Demeester 4826a5c3af Fixing a small typo in compose loader package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-20 15:39:57 +01:00
liker12134 cc44dec589 fixed:go vetting warning unkeyed fields 
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
 2017-03-20 16:30:01 +08:00
Boaz Shuster b8d5b0f675 Use formatter in docker checkpoint ls 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-19 09:24:15 +02:00
Boaz Shuster 1bac314da5 Add format to secret ls 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-19 09:22:30 +02:00
Vincent Demeester 6e24fc3f58 Merge pull request #30781 from AkihiroSuda/fix-stack-env 
compose: fix environment interpolation from the client
 2017-03-17 15:56:50 +01:00
Akihiro Suda 2fc6cd4b71 compose: update the comment about MappingWithEquals 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-17 06:21:55 +00:00
Sebastiaan van Stijn 2222824fd9 Merge pull request #31896 from aaronlehmann/move-secretrequestoption 
api: Remove SecretRequestOption type
 2017-03-16 21:31:15 +01:00
Sebastiaan van Stijn a3a3e2dba6 Merge pull request #31886 from daniel48/master 
fix a typo
 2017-03-16 21:30:22 +01:00
Sebastiaan van Stijn 1aca09b8cc Merge pull request #31894 from dnephin/fix-schema-id 
Fix compose schema id for v3.2
 2017-03-16 21:19:59 +01:00
Aaron Lehmann 395081fc6b api: Remove SecretRequestOption type 
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-16 11:20:31 -07:00
Daniel Nephin d0fb25319b Fix compose schema id for v3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-16 13:53:58 -04:00
Pure White 7fe0d2d64d fix a typo 
when i was using:
docker search --automated -s 3 nginx
told me:
Flag --automated has been deprecated, use --filter=automated=true instead
Flag --stars has been deprecated, use --filter=stars=3 instead
and when i use:
docker search --filter=automated=true --filter=stars=3 nginx
told me:
Error response from daemon: Invalid filter 'automated'
and i found out that the correct command should be:
docker search --filter=is-automated=true --filter=stars=3 nginx

Signed-off-by: Pure White <daniel48@126.com>
 2017-03-16 23:11:57 +08:00
Sebastiaan van Stijn 998950a9f4 Improve error handling of commands run against unsupported daemon 
The current error-handling only checked for version annotations
on the subcommand itself, but did not check the top-level command.

This patch always traverses the command path (parents), and
prints an error if the command is not supported.

Before this change:

    $ docker service
    Usage:	docker service COMMAND

    Manage services

    Options:
          --help   Print usage

    Commands:
      create      Create a new service
      inspect     Display detailed information on one or more services
      ls          List services
      ps          List the tasks of one or more services
      rm          Remove one or more services
      scale       Scale one or multiple replicated services
      update      Update a service

    Run 'docker service COMMAND --help' for more information on a command.

    $ docker service ls
    ID                  NAME                MODE                REPLICAS            IMAGE

After this change:

    $ DOCKER_API_VERSION=1.12 docker service
    docker service requires API version 1.24, but the Docker daemon API version is 1.12

    $ DOCKER_API_VERSION=1.12 docker service ls
    docker service ls requires API version 1.24, but the Docker daemon API version is 1.12

    $ DOCKER_API_VERSION=1.24 docker plugin --help
    docker plugin requires API version 1.25, but the Docker daemon API version is 1.24

    $ DOCKER_API_VERSION=1.25 docker plugin upgrade --help
    docker plugin upgrade requires API version 1.26, but the Docker daemon API version is 1.25

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-16 13:45:50 +01:00
Sebastiaan van Stijn d5d0d7795b Add missing API version annotations to commands 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-16 13:40:12 +01:00
Vincent Demeester 96551fee53 Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag 
misleading default for --update-monitor duration
 2017-03-16 10:13:26 +01:00
Vincent Demeester d4ed696179 Merge pull request #31866 from gdevillele/pr_service_create 
improve semantics of utility function in cli/command/service
 2017-03-16 10:12:15 +01:00
Akihiro Suda 4031d93f61 Merge pull request #31057 from krasi-georgiev/30779-fix-client-login-credentials-save-domain 
fix incorect login client credential save when the registry is the default docker registry
 2017-03-16 13:19:32 +09:00
Gaetan de Villele 59c79325bc improve semantics of utility function in cli/command/service 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2017-03-15 13:49:52 -07:00
Victor Vieux bc771127d8 Revert "Planned 1.13 deprecation: email from login" 
This reverts commit a66efbddb8eaa837cf42aae20b76c08274271dcf.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-15 10:43:18 -07:00
Sebastiaan van Stijn 69b7bf5e9f Merge pull request #31302 from dnephin/purge-orphaned-services 
Add --prune to stack deploy
 2017-03-15 12:57:06 +01:00
erxian 88a99ae70e misleading default for --update-monitor duration 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2017-03-15 14:20:02 +08:00
Anusha Ragunathan d510306bb7 Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format 
docker stack deploy interpolation format error due to not escaping $ now includes a hint
 2017-03-14 17:14:09 -07:00
Daniel Nephin b1a98b55af Add --prune to stack deploy. 
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-14 16:09:28 -04:00
Daniel Nephin 146d3eb304 Fix environment resolving. 
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-14 16:00:43 -04:00
Akihiro Suda b7ffa960bf compose: fix environment interpolation from the client 
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-14 15:59:40 -04:00
Victor Vieux 5ce6afc459 Merge pull request #31809 from vieux/bump_api 
bump API to 1.28
 2017-03-14 11:53:52 -07:00
Daniel Nephin d1fc5acc2e Merge pull request #31795 from dnephin/compose-file-v3.2 
Compose file v3.2
 2017-03-14 14:10:24 -04:00
Justin Cormack b8c49df008 Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy 
Add expanded mount format to stack deploy
 2017-03-14 17:53:28 +00:00
Victor Vieux a972d43e48 bump API to 1.28 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-14 09:32:50 -07:00
Vincent Demeester 7ce0cb0cf0 Merge pull request #31500 from dperny/fix-service-logs-cli 
Add tail and since to service logs
 2017-03-14 14:19:29 +01:00
Madhu Venugopal d99bce7b1c Merge pull request #31710 from sanimej/drillerrr 
Add verbose flag to network inspect to show all services & tasks in swarm mode
 2017-03-13 21:12:32 -07:00
Madhu Venugopal 5ad1cebf78 Merge pull request #31710 from sanimej/drillerrr 
Add verbose flag to network inspect to show all services & tasks in swarm mode
 2017-03-13 21:12:32 -07:00
Santhosh Manohar faee4c005b Enhance network inspect to show all tasks, local & non-local, in swarm mode 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-03-13 17:52:08 -07:00
Santhosh Manohar 6c7da0ca57 Enhance network inspect to show all tasks, local & non-local, in swarm mode 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-03-13 17:52:08 -07:00
Brian Goff 8b3bfc15c3 Merge pull request #31672 from dperny/service-logs-formatting 
Service logs formatting
 2017-03-13 19:08:55 -04:00
Daniel Nephin 2e9b15143a Add compose file version 3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 16:20:42 -04:00
Daniel Nephin 4e388c22d3 Refactor container run cli command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 16:05:51 -04:00
Daniel Nephin 33bfb1e5e5 Move endpoint_mode under deploy and add it to the schema. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 15:00:56 -04:00
allencloud cd1cde6e77 support both endpoint modes in stack 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-13 15:00:49 -04:00
Justin Cormack b786563826 Merge pull request #31579 from ijc25/cpuacct 
Correct CPU usage calculation in presence of offline CPUs and newer Linux
 2017-03-13 16:32:18 +00:00
Vincent Demeester 278e4ccdc5 Merge pull request #30788 from ripcurld0/hide_win_opts 
Hide command options that are related to Windows
 2017-03-13 16:15:29 +01:00
Sebastiaan van Stijn be1855fac4 Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect 
do not fail fast when executing inspect command
 2017-03-13 16:04:04 +01:00
Boaz Shuster e398a78466 Hide command options that are related to Windows 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-12 08:47:17 +02:00
Boaz Shuster 818c54a2ca Hide command options that are related to Windows 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-12 08:47:17 +02:00
Boaz Shuster c7dd91faf5 Hide command options that are related to Windows 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-12 08:47:17 +02:00