Commit Graph

637 Commits

Author SHA1 Message Date
ec52e4b8df Synchronous service create and service update
Change "service create" and "service update" to wait until the creation
or update finishes, when --detach=false is specified. Show progress bars
for the overall operation and for each individual task (when there are a
small enough number of tasks), unless "-q" / "--quiet" is specified.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d8ab3840e0
Component: cli
2017-04-03 09:46:01 -07:00
b6718bde5c Merge pull request #32124 from vdemeester/system-inspect-secret
Add support for `--type=secret` in `docker inspect`
Upstream-commit: f066943a05
Component: cli
2017-03-30 17:01:57 +02:00
ca5fbaaa27 Merge pull request #31830 from dnephin/refactor-cli-state
Small cleanup now that we have multiple details about the server stored on the cli
Upstream-commit: 9cfbcd4471
Component: cli
2017-03-29 13:36:32 +02:00
e52c9b7f1d Merge pull request #32186 from aaronlehmann/cluster-omitempty
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
Upstream-commit: 8356bd527c
Component: cli
2017-03-29 10:38:52 +02:00
5387d6dcb0 api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
Currently these fields are included in the response JSON with zero
values. It's better not to include them if the information is
unavailable (for example, on a worker node).

This turns Cluster into a pointer so that it can be left out.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e6445629d7
Component: cli
2017-03-28 14:20:25 -07:00
9942af3507 Add entrypoint flags to service cli.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 951fdd11cd
Component: cli
2017-03-28 11:24:19 -07:00
1a3472a804 Merge pull request #30810 from allencloud/make-secret-ls-support-filter
make secret ls support filters in CLI
Upstream-commit: d14a4d4231
Component: cli
2017-03-28 13:43:19 +02:00
cc486b1c0b Add support for --type=secret in docker inspect
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ba785f32f8
Component: cli
2017-03-28 10:48:48 +02:00
fb444d02c2 Merge pull request #31709 from dnephin/better-errors
Replace fmt.Errorf() with errors.Errorf() in the cli
Upstream-commit: dc2e0149a8
Component: cli
2017-03-28 10:17:46 +02:00
39ae1f89f8 Merge pull request #32128 from vdemeester/30836-set-alias-to-servicename
Set the alias to the service name instead of the network name
Upstream-commit: e2e4b0f9a8
Component: cli
2017-03-28 09:46:05 +02:00
8f6c4a1b5b Manually reorganize import paths to segregate stdlib and 3rd-party packages
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: d26a23ceb8
Component: cli
2017-03-27 18:21:59 -07:00
9e8fe95f89 Merge pull request #31714 from aboch/cingr
Allow user to replace ingress network
Upstream-commit: 24faf9edaf
Component: cli
2017-03-27 07:30:42 -07:00
e595996da4 Set the alias to the service name instead of the network name
This makes it work a little closer to compose part and it is more
correct 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: aaf865edb5
Component: cli
2017-03-27 11:42:15 +02:00
6445b15529 make secret ls support filters in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d6490e5de9
Component: cli
2017-03-27 10:16:45 +08:00
19fb367fca Allow user to modify ingress network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 0f6dd9c2e8
Component: cli
2017-03-26 15:46:18 -07:00
39de28d502 Merge pull request #31976 from Microsoft/jjh/csbooboo
Windows: Remove --credentialspec flag
Upstream-commit: ca1aca0afe
Component: cli
2017-03-26 12:44:27 +02:00
25b1b9c3c2 Replace fmt.Errorf() with errors.Errorf() in the cli
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e9d6193dfd
Component: cli
2017-03-24 16:58:07 -04:00
d7600dd841 Windows: Remove --credentialspec flag
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
Upstream-commit: c8f2ef1b1e
Component: cli
2017-03-23 10:01:04 -07:00
6aedaf0c02 Merge pull request #31986 from Microsoft/jjh/fix28267
Windows: Don't close client stdin handle to avoid hang
Upstream-commit: 8a16f32da7
Component: cli
2017-03-23 16:35:54 +01:00
1d07f176cb Return proper exit code on builder panic
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 82b04969b7
Component: cli
2017-03-21 19:09:23 -07:00
748bae2fe6 Windows: Don't close client stdin handle to avoid hang
Signed-off-by: John Howard (VM) <jhoward@microsoft.com>
Upstream-commit: e8be542957
Component: cli
2017-03-21 16:00:17 -07:00
0cae42f93c Merge pull request #31705 from cyli/bump-go-connections
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
Upstream-commit: 6bc233965e
Component: cli
2017-03-21 10:36:41 -07:00
ad7ff06c3f Merge pull request #31621 from dnephin/cleanup-container-run-command
Some cleanup of container run command
Upstream-commit: 250c3f0db2
Component: cli
2017-03-21 16:01:11 +01:00
70615a5680 Merge pull request #31552 from ripcurld0/add_format_secretls
Add format to secret ls
Upstream-commit: e1409013e5
Component: cli
2017-03-20 20:20:45 +01:00
6c48ab35fe Create a new ServerType struct for storing details about the server on the client.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4ab8463fed
Component: cli
2017-03-20 12:48:25 -04:00
5d9a5ce7dd fixed:go vetting warning unkeyed fields
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
Upstream-commit: cc44dec589
Component: cli
2017-03-20 16:30:01 +08:00
bbac6dc261 Add format to secret ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 1bac314da5
Component: cli
2017-03-19 09:22:30 +02:00
7332a7a5de Merge pull request #30781 from AkihiroSuda/fix-stack-env
compose: fix environment interpolation from the client
Upstream-commit: 6e24fc3f58
Component: cli
2017-03-17 15:56:50 +01:00
540d48f844 Merge pull request #31896 from aaronlehmann/move-secretrequestoption
api: Remove SecretRequestOption type
Upstream-commit: 2222824fd9
Component: cli
2017-03-16 21:31:15 +01:00
d88d78826a Merge pull request #31886 from daniel48/master
fix a typo
Upstream-commit: a3a3e2dba6
Component: cli
2017-03-16 21:30:22 +01:00
8698efadf8 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>
Upstream-commit: 395081fc6b
Component: cli
2017-03-16 11:20:31 -07:00
e28e72773d 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>
Upstream-commit: 7fe0d2d64d
Component: cli
2017-03-16 23:11:57 +08:00
c74c88f8f7 Add missing API version annotations to commands
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d5d0d7795b
Component: cli
2017-03-16 13:40:12 +01:00
970755e1f9 Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag
misleading default for --update-monitor duration
Upstream-commit: 96551fee53
Component: cli
2017-03-16 10:13:26 +01:00
e19ea1e497 Merge pull request #31866 from gdevillele/pr_service_create
improve semantics of utility function in cli/command/service
Upstream-commit: d4ed696179
Component: cli
2017-03-16 10:12:15 +01:00
f295088cb4 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
Upstream-commit: 4031d93f61
Component: cli
2017-03-16 13:19:32 +09:00
559c313548 improve semantics of utility function in cli/command/service
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 59c79325bc
Component: cli
2017-03-15 13:49:52 -07:00
2524c32d21 Revert "Planned 1.13 deprecation: email from login"
This reverts commit a66efbddb8eaa837cf42aae20b76c08274271dcf.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: bc771127d8
Component: cli
2017-03-15 10:43:18 -07:00
f462549c13 misleading default for --update-monitor duration
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 88a99ae70e
Component: cli
2017-03-15 14:20:02 +08:00
0ed0e112c4 Add --prune to stack deploy.
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b1a98b55af
Component: cli
2017-03-14 16:09:28 -04:00
63bca6acc7 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>
Upstream-commit: 146d3eb304
Component: cli
2017-03-14 16:00:43 -04:00
85cd81c04a 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>
Upstream-commit: b7ffa960bf
Component: cli
2017-03-14 15:59:40 -04:00
37cb7be49a Merge pull request #31809 from vieux/bump_api
bump API to 1.28
Upstream-commit: 5ce6afc459
Component: cli
2017-03-14 11:53:52 -07:00
29417b0159 bump API to 1.28
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: a972d43e48
Component: cli
2017-03-14 09:32:50 -07:00
2e62b306a8 Merge pull request #31500 from dperny/fix-service-logs-cli
Add tail and since to service logs
Upstream-commit: 7ce0cb0cf0
Component: cli
2017-03-14 14:19:29 +01:00
caa4b9a71c Merge pull request #31710 from sanimej/drillerrr
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: 5ad1cebf78
Component: cli
2017-03-13 21:12:32 -07:00
acc4901d56 Enhance network inspect to show all tasks, local & non-local, in swarm mode
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 6c7da0ca57
Component: cli
2017-03-13 17:52:08 -07:00
15bb8a00b0 Merge pull request #31672 from dperny/service-logs-formatting
Service logs formatting
Upstream-commit: 8b3bfc15c3
Component: cli
2017-03-13 19:08:55 -04:00
29b6bbfa5e Refactor container run cli command.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4e388c22d3
Component: cli
2017-03-13 16:05:51 -04:00
fe5268e5c2 Merge pull request #31579 from ijc25/cpuacct
Correct CPU usage calculation in presence of offline CPUs and newer Linux
Upstream-commit: b786563826
Component: cli
2017-03-13 16:32:18 +00:00