beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31788 commits 14 branches 412 tags 338 MiB
Commit graph

829 commits

Author SHA1 Message Date
Erik Hollensbe
8a7ff5ff74 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>
 2017-04-12 10:33:19 +00:00
Sebastiaan van Stijn
fe4d7db1ec Merge pull request #30813 from yongtang/30232-service-ls-ports 
Add `PORTS` field for `docker service ls` (`ingress`)
 2017-04-04 17:04:27 +02:00
Vincent Demeester
93ffbb76c3 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
Victor Vieux
170be9c267 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
Drew Erny
d330dc3223 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
Yong Tang
c877c7b2bf 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>
 2017-04-03 18:40:15 -07:00
Victor Vieux
21ec12b967 Merge pull request #31144 from aaronlehmann/synchronous-service-commands 
Synchronous service create and service update
 2017-04-03 17:44:03 -07:00
Daniel Nephin
25f00866e3 Fix endpoint mode in Compose format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-03 17:51:31 -04:00
Aaron Lehmann
330a003533 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
Vincent Demeester
d9c3c1928d 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
Sebastiaan van Stijn
571e403168 Merge pull request #32282 from mstanleyjones/improve-attach-desc 
Clarify meaning of docker attach
 2017-04-01 20:52:26 +02:00
Victor Vieux
3dfce9fbb8 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
Victor Vieux
e45483964f Merge pull request #31800 from ripcurld0/checkpoint_ls 
Use formatter in docker checkpoint ls
 2017-03-31 15:54:22 -07:00
Misty Stanley-Jones
1922eac4cc Clarify meaning of docker attach 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-03-31 13:22:21 -07:00
Kenfe-Mickaël Laventure
3d31198cda Merge pull request #31599 from ripcurld0/diff_cmd_format 
Use formatter in docker diff
 2017-03-31 11:19:41 -07:00
Vincent Demeester
ee61f28cc3 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
Boaz Shuster
3dad39b957 Use formatter in docker diff 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-30 10:33:40 +03:00
Daniel Zhang
50aa1e5b28 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
Sebastiaan van Stijn
bce494f7a2 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
Vincent Demeester
4180211d80 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
Aaron Lehmann
3894254ddd 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
Daniel Nephin
d3ea30de10 Add entrypoint flags to service cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-28 11:24:19 -07:00
Sebastiaan van Stijn
4df350b8c7 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
Vincent Demeester
71129f6be6
Add support for --type=secret in docker inspect 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-28 10:48:48 +02:00
Vincent Demeester
99aaf6b923 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
Vincent Demeester
4155343f44 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
Tibor Vass
0d08818653 Do not replace fmt.Errorf in generated file 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-03-27 18:33:41 -07:00
Tibor Vass
febbe38796 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
Madhu Venugopal
04295d26df Merge pull request #31714 from aboch/cingr 
Allow user to replace ingress network
 2017-03-27 07:30:42 -07:00
Vincent Demeester
ee08c8542a
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
allencloud
3935074016 make secret ls support filters in CLI 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-27 10:16:45 +08:00
Alessandro Boch
d59d19c328 Allow user to modify ingress network 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-26 15:46:18 -07:00
Vincent Demeester
ab08a571d1 Merge pull request #31976 from Microsoft/jjh/csbooboo 
Windows: Remove --credentialspec flag
 2017-03-26 12:44:27 +02:00
Daniel Nephin
7b7ea8ab81 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
Daniel Nephin
7236686987 Fix external volume error to pass validation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-24 16:55:04 -04:00
Daniel Nephin
b03a185723 Cleanup compose convert error messages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-24 10:43:28 -04:00
Vincent Demeester
8d2a82853c 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
John Howard (VM)
53d6aadda5 Windows: Remove --credentialspec flag 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
 2017-03-23 10:01:04 -07:00
Sebastiaan van Stijn
ad530ffee0 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
Vincent Demeester
c165a8bfa1
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
Vincent Demeester
bb1ae453a6 Merge pull request #32002 from vdemeester/compose-remove-type-dict 
Remove compose types.Dict alias
 2017-03-22 23:08:09 +01:00
Vincent Demeester
d3dc27d145
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
Tonis Tiigi
385f1174ff Return proper exit code on builder panic 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-21 19:09:23 -07:00
Aaron Lehmann
ad1c96c6a7 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
John Howard (VM)
91e971c0fe 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
Victor Vieux
afe1c5c2eb 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
Vincent Demeester
f965aab5e9 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
1ec77baed9 Merge pull request #31552 from ripcurld0/add_format_secretls 
Add format to secret ls
 2017-03-20 20:20:45 +01:00
Vincent Demeester
550b06ab6a 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
4152243985 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