Commit Graph

653 Commits

Author SHA1 Message Date
d224015064 daemon/archive.go: Fix copy routines to preserve UID.
This changes the long-standing bug of copy operations not preserving the
UID/GID information after the files arrive to the container.

Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Upstream-commit: 7a767a1a7e
Component: cli
2017-04-12 10:33:19 +00:00
c25dd274e9 Merge pull request #30813 from yongtang/30232-service-ls-ports
Add `PORTS` field for `docker service ls` (`ingress`)
Upstream-commit: 9a5513b791
Component: cli
2017-04-04 17:04:27 +02:00
d9725d161b Merge pull request #32015 from dperny/service-logs-support-task-logs
Add Support for Service Task Logs
Upstream-commit: 4284efd232
Component: cli
2017-04-04 00:15:13 -07:00
1ea7589fcb 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>
Upstream-commit: b4ca6ebb09
Component: cli
2017-04-03 18:40:54 -07:00
f9c12f483a Add PORTS field for docker service ls (ingress)
This fix is related to 30232 wherw `docker service ls`
does not show `PORTS` information like `docker service ps`.

This fix adds `PORTS` fields for services that publish
ports in ingress mode.

Additional unit tests cases have been updated.

This fix is related to 30232.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e0d4e672a1
Component: cli
2017-04-03 18:40:15 -07:00
6c6797e0f8 Merge pull request #31144 from aaronlehmann/synchronous-service-commands
Synchronous service create and service update
Upstream-commit: 1551ffaa38
Component: cli
2017-04-03 17:44:03 -07:00
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
3e55a3b7e8 Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode
cli: Wrong error message from "node ps" outside swarm mode
Upstream-commit: d37d03c9dc
Component: cli
2017-04-03 16:15:24 +02:00
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
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
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
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
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
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
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
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
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
eb1ed29f05 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>
Upstream-commit: d59f6d0933
Component: cli
2017-03-21 17:01:07 -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
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
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