490d99babe
Merge pull request #32333 from dnephin/fix-endpoint-mode
...
Fix endpoint mode loading from Compose file in stack deploy
2017-04-04 14:12:26 +02:00
4284efd232
Merge pull request #32015 from dperny/service-logs-support-task-logs
...
Add Support for Service Task Logs
2017-04-04 00:15:13 -07:00
b4ca6ebb09
Add support for task and arbitrary combo logs
...
Refactored the API to more easily accept new endpoints. Added REST,
client, and CLI endpoints for getting logs from a specific task. All
that is needed after this commit to enable arbitrary service log
selectors is a REST endpoint and handler.
Task logs can be retrieved by putting in a task ID at the CLI instead of
a service ID.
Signed-off-by: Drew Erny <drew.erny@docker.com>
2017-04-03 18:40:54 -07:00
1551ffaa38
Merge pull request #31144 from aaronlehmann/synchronous-service-commands
...
Synchronous service create and service update
2017-04-03 17:44:03 -07:00
64c6b9a938
Fix endpoint mode in Compose format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-03 17:51:31 -04:00
d8ab3840e0
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>
2017-04-03 09:46:01 -07:00
d37d03c9dc
Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode
...
cli: Wrong error message from "node ps" outside swarm mode
2017-04-03 16:15:24 +02:00
a090dc9653
Merge pull request #32282 from mstanleyjones/improve-attach-desc
...
Clarify meaning of docker attach
2017-04-01 20:52:26 +02:00
e959064068
Merge pull request #31022 from jmzwcn/issue30994
...
docker version output is not consistent when there are downgrades or incompatibilities #30994
2017-03-31 15:55:03 -07:00
4666c3e589
Merge pull request #31800 from ripcurld0/checkpoint_ls
...
Use formatter in docker checkpoint ls
2017-03-31 15:54:22 -07:00
081ac522bd
Clarify meaning of docker attach
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-03-31 13:22:21 -07:00
e3596db1a2
Merge pull request #31599 from ripcurld0/diff_cmd_format
...
Use formatter in docker diff
2017-03-31 11:19:41 -07:00
f066943a05
Merge pull request #32124 from vdemeester/system-inspect-secret
...
Add support for `--type=secret` in `docker inspect`
2017-03-30 17:01:57 +02:00
6fd69bd855
Use formatter in docker diff
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-03-30 10:33:40 +03:00
ce972716be
Docker version output is not consistent when there are downgrades or incompatibilities.
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2017-03-29 21:53:19 +08:00
9cfbcd4471
Merge pull request #31830 from dnephin/refactor-cli-state
...
Small cleanup now that we have multiple details about the server stored on the cli
2017-03-29 13:36:32 +02:00
8356bd527c
Merge pull request #32186 from aaronlehmann/cluster-omitempty
...
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
2017-03-29 10:38:52 +02:00
e6445629d7
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>
2017-03-28 14:20:25 -07:00
951fdd11cd
Add entrypoint flags to service cli.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-28 11:24:19 -07:00
d14a4d4231
Merge pull request #30810 from allencloud/make-secret-ls-support-filter
...
make secret ls support filters in CLI
2017-03-28 13:43:19 +02:00
ba785f32f8
Add support for `--type=secret` in `docker inspect`
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-28 10:48:48 +02:00
dc2e0149a8
Merge pull request #31709 from dnephin/better-errors
...
Replace fmt.Errorf() with errors.Errorf() in the cli
2017-03-28 10:17:46 +02:00
e2e4b0f9a8
Merge pull request #32128 from vdemeester/30836-set-alias-to-servicename
...
Set the alias to the service name instead of the network name
2017-03-28 09:46:05 +02:00
96e610e67a
Do not replace fmt.Errorf in generated file
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-27 18:33:41 -07:00
d26a23ceb8
Manually reorganize import paths to segregate stdlib and 3rd-party packages
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-27 18:21:59 -07:00
24faf9edaf
Merge pull request #31714 from aboch/cingr
...
Allow user to replace ingress network
2017-03-27 07:30:42 -07:00
aaf865edb5
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>
2017-03-27 11:42:15 +02:00
d6490e5de9
make secret ls support filters in CLI
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-03-27 10:16:45 +08:00
0f6dd9c2e8
Allow user to modify ingress network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-26 15:46:18 -07:00
ca1aca0afe
Merge pull request #31976 from Microsoft/jjh/csbooboo
...
Windows: Remove --credentialspec flag
2017-03-26 12:44:27 +02:00
e9d6193dfd
Replace fmt.Errorf() with errors.Errorf() in the cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 16:58:07 -04:00
c1b2fad9aa
Fix external volume error to pass validation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 16:55:04 -04:00
c70387aebc
Cleanup compose convert error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-24 10:43:28 -04:00
7e6c7a52ce
Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic
...
[compose/interpolation] Make sure we error out instead of panic during interpolation
2017-03-24 09:00:06 +01:00
c8f2ef1b1e
Windows: Remove --credentialspec flag
...
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
2017-03-23 10:01:04 -07:00
8a16f32da7
Merge pull request #31986 from Microsoft/jjh/fix28267
...
Windows: Don't close client stdin handle to avoid hang
2017-03-23 16:35:54 +01:00
fe19bc6891
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>
2017-03-23 16:09:57 +01:00
019d27350b
Merge pull request #32002 from vdemeester/compose-remove-type-dict
...
Remove compose types.Dict alias
2017-03-22 23:08:09 +01:00
a1e1ab78d0
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>
2017-03-22 16:16:20 +01:00
82b04969b7
Return proper exit code on builder panic
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-21 19:09:23 -07:00
d59f6d0933
cli: Wrong error message from "node ps" outside swarm mode
...
"docker node ps" behaves strangely outside swarm mode:
$ docker node ps
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS
Error: No such node:
It should explain that the node is not a swarm manager.
The reason this happens is that the argument to "docker node ps" defaults
to "self". The first thing the command does is try to resolve "self" to
a node ID using the /info endpoint. If there is no node ID, it tries to
use the empty string as an ID, and tries to GET /nodes/, which is not a
valid endpoint.
Change the command to check if the node ID is present in the /info
response. If it isn't, a swarm API endpoint can supply a useful error
message.
Also, avoid printing the column headers if the only following text is an
error.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-21 17:01:07 -07:00
e8be542957
Windows: Don't close client stdin handle to avoid hang
...
Signed-off-by: John Howard (VM) <jhoward@microsoft.com>
2017-03-21 16:00:17 -07:00
6bc233965e
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)
2017-03-21 10:36:41 -07:00
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
e1409013e5
Merge pull request #31552 from ripcurld0/add_format_secretls
...
Add format to secret ls
2017-03-20 20:20:45 +01:00
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
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
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
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
b8d5b0f675
Use formatter in docker checkpoint ls
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-03-19 09:24:15 +02:00
Vincent Demeester
Victor Vieux
Drew Erny
Daniel Nephin
Aaron Lehmann
Sebastiaan van Stijn
Misty Stanley-Jones
Kenfe-Mickaël Laventure
Boaz Shuster
Daniel Zhang
Tibor Vass
Madhu Venugopal
allencloud
Alessandro Boch
John Howard (VM)
Tonis Tiigi
John Howard (VM)
liker12134