Sebastiaan van Stijn
5d674e346c
Merge pull request #32282 from mstanleyjones/improve-attach-desc
...
Clarify meaning of docker attach
Upstream-commit: a090dc9653
Component: cli
2017-04-01 20:52:26 +02:00
Victor Vieux
7ac9af3ace
Merge pull request #31022 from jmzwcn/issue30994
...
docker version output is not consistent when there are downgrades or incompatibilities #30994
Upstream-commit: e959064068
Component: cli
2017-03-31 15:55:03 -07:00
Victor Vieux
15b935e3df
Merge pull request #31800 from ripcurld0/checkpoint_ls
...
Use formatter in docker checkpoint ls
Upstream-commit: 4666c3e589
Component: cli
2017-03-31 15:54:22 -07:00
Misty Stanley-Jones
de8ce4417c
Clarify meaning of docker attach
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 081ac522bd
Component: cli
2017-03-31 13:22:21 -07:00
Kenfe-Mickaël Laventure
0e14500771
Merge pull request #31599 from ripcurld0/diff_cmd_format
...
Use formatter in docker diff
Upstream-commit: e3596db1a2
Component: cli
2017-03-31 11:19:41 -07:00
Vincent Demeester
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
Boaz Shuster
523a49ca3f
Use formatter in docker diff
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 6fd69bd855
Component: cli
2017-03-30 10:33:40 +03:00
Daniel Zhang
ac0fab4ce0
Docker version output is not consistent when there are downgrades or incompatibilities.
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: ce972716be
Component: cli
2017-03-29 21:53:19 +08:00
Sebastiaan van Stijn
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
Vincent Demeester
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
Aaron Lehmann
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
Daniel Nephin
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Tibor Vass
cda26f1da0
Do not replace fmt.Errorf in generated file
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 96e610e67a
Component: cli
2017-03-27 18:33:41 -07:00
Tibor Vass
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
Madhu Venugopal
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
Vincent Demeester
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
allencloud
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
Alessandro Boch
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
Vincent Demeester
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
Daniel Nephin
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
Daniel Nephin
7827d424b6
Fix external volume error to pass validation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c1b2fad9aa
Component: cli
2017-03-24 16:55:04 -04:00
Daniel Nephin
8cc3b14857
Cleanup compose convert error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c70387aebc
Component: cli
2017-03-24 10:43:28 -04:00
Vincent Demeester
7a28978889
Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic
...
[compose/interpolation] Make sure we error out instead of panic during interpolation
Upstream-commit: 7e6c7a52ce
Component: cli
2017-03-24 09:00:06 +01:00
John Howard (VM)
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
Sebastiaan van Stijn
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
Vincent Demeester
ff2a4eeb5b
Make sure we error out instead of panic during interpolation
...
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: fe19bc6891
Component: cli
2017-03-23 16:09:57 +01:00
Vincent Demeester
0d0eb1b02d
Merge pull request #32002 from vdemeester/compose-remove-type-dict
...
Remove compose types.Dict alias
Upstream-commit: 019d27350b
Component: cli
2017-03-22 23:08:09 +01:00
Vincent Demeester
0c575acb31
Remove compose types.Dict alias
...
It is just an alias type and make the code a little bit more complex
and hard to use from outside `compose` package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a1e1ab78d0
Component: cli
2017-03-22 16:16:20 +01:00
Tonis Tiigi
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
John Howard (VM)
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
Victor Vieux
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Vincent Demeester
b5ecd1b831
Merge pull request #31948 from vdemeester/compose-typo
...
Fixing a small typo in compose loader package
Upstream-commit: 586412ce39
Component: cli
2017-03-20 17:48:50 +01:00
Daniel Nephin
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
Vincent Demeester
589b564e68
Fixing a small typo in compose loader package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4826a5c3af
Component: cli
2017-03-20 15:39:57 +01:00
liker12134
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
Boaz Shuster
6963169966
Use formatter in docker checkpoint ls
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: b8d5b0f675
Component: cli
2017-03-19 09:24:15 +02:00
Boaz Shuster
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
Vincent Demeester
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
Akihiro Suda
abd145043b
compose: update the comment about MappingWithEquals
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 2fc6cd4b71
Component: cli
2017-03-17 06:21:55 +00:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
d88d78826a
Merge pull request #31886 from daniel48/master
...
fix a typo
Upstream-commit: a3a3e2dba6
Component: cli
2017-03-16 21:30:22 +01:00
Sebastiaan van Stijn
ad43a90ae5
Merge pull request #31894 from dnephin/fix-schema-id
...
Fix compose schema id for v3.2
Upstream-commit: 1aca09b8cc
Component: cli
2017-03-16 21:19:59 +01:00
Aaron Lehmann
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
Daniel Nephin
db27025447
Fix compose schema id for v3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d0fb25319b
Component: cli
2017-03-16 13:53:58 -04:00