Commit Graph

850 Commits

Author SHA1 Message Date
708ad46cdf Adopt text/template in node inspect
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
Upstream-commit: 5dbd6afb5144a937df73bfe42364e583e789d80d
Component: engine
2017-04-10 17:47:15 +05:30
04adcf44c3 Merge pull request #31364 from adshmh/30935-use-encrypted-client-certificate-to-connect-to-a-docker-host
use an encrypted client certificate to connect to a docker daemon
Upstream-commit: 2daa2b894c1cf62936fe55dc8782c486aafaecdd
Component: engine
2017-04-10 10:42:01 +02:00
cb5c83df55 Merge pull request #32409 from dnephin/support-consistency-params-in-compose
Add support for volume consistency in compose format
Upstream-commit: fc6d8fb94d2d9070e58d83dbf13f40c0efa715e3
Component: engine
2017-04-07 17:26:50 -07:00
137edd889c Merge pull request #32339 from aluzzardi/selinux
services: Add support for Credential Spec and SELinux
Upstream-commit: 091b5e68ea735bf4e8ece708bbc8c413a32eab73
Component: engine
2017-04-08 01:37:17 +02:00
ddc6479238 Merge pull request #32154 from dperny/refactor-logs
Refactor logs and support service logs with TTY 
Upstream-commit: 4a1a64c67768d6fbcf20a1b37ee58212b7e870c6
Component: engine
2017-04-07 18:06:50 -04:00
e41369fcc4 services: Add support for Credential Spec and SELinux
- Defined "normalized" type for Credential Spec and SELinux
- Added --credential-spec to docker service create & update
- SELinux is API only at the time

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 89a995a9d77cc4f95a29579e0a2b12cb3d805749
Component: engine
2017-04-07 11:30:54 -07:00
9156acdd4f Add support for volume consistency in compose format.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ae27355b095181748daa1d68d07f8e45904b14cc
Component: engine
2017-04-07 13:23:33 -04:00
072232e704 Merge pull request #32289 from adshmh/add-unit-tests-for-cli-command-secret-package
add unit tests for package cli/command/secret
Upstream-commit: 8b9d54c084c951f57219de706ddb45fc2305ca89
Component: engine
2017-04-07 15:26:40 +02:00
1f0e0155dc use an encrypted client certificate to connect to a docker daemon
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 603dd8b3b48273c0c7e1f2aef5f344acac66424e
Component: engine
2017-04-07 01:50:51 -04:00
334f054f13 refactor logs and support service logs /w tty
Refactor container logs system to make communicating log messages
internally much simpler. Move responsibility for marshalling log
messages into the REST server. Support TTY logs. Pave the way for fixing
the ambiguous bytestream format. Pave the way for fixing details.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 1044093bb0aa12eb8972361a93b9bc8c4ddd857b
Component: engine
2017-04-06 17:54:11 -07:00
1623433ab1 Add support for update order
This parameter controls the order of operations when rolling out an
update task. Either the old task is stopped before starting the new one,
or the new task is started first, and the running tasks will briefly
overlap.

This commit adds Rollout to the API, and --update-order / --rollback-order
flags to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9b54994a8ada6ae15a4d2c3b925568e2061200ad
Component: engine
2017-04-06 17:23:36 -07:00
a532c2b899 Merge pull request #32407 from dnephin/fix-rw-mode-compose-files
Support rw as a volume option in compose file
Upstream-commit: 30cdabd13f5cbb09370c3db3f5c7d1384043f3f4
Component: engine
2017-04-06 16:24:20 -04:00
6f724a82a6 Merge pull request #28938 from elifa/master
Grace period option to health checks.
Upstream-commit: c4010e257f60d4204c5c2f5dc5a8aa5313d1b254
Component: engine
2017-04-06 19:23:56 +02:00
0d79f39f39 Support rw as a volume option in compose file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 062830535df4d944fd8e4d626f3da5bdc7b1993a
Component: engine
2017-04-06 10:32:35 -04:00
d9412325fb Merge pull request #32364 from aaronlehmann/preserve-env-order
cli: Preserve order of environment variables
Upstream-commit: f5d881b835fbc12fdb4b0840ab26333170c705f3
Component: engine
2017-04-06 14:25:29 +02:00
e25f6c5a1b Added start period option to health check.
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
Upstream-commit: e401f63735d8ebcff387c571d1f61ce52bdea86e
Component: engine
2017-04-06 12:35:34 +02:00
ed86f7c60d Merge pull request #32251 from AkihiroSuda/run-mount
cli: add `--mount` to `docker run`
Upstream-commit: 945a119c8a52118ebee6c53f46e9846ea9e76c5e
Component: engine
2017-04-05 22:34:47 +02:00
6c1668c7bd cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 77fe35b3b903831bd9cfb60a806d056195dc14b6
Component: engine
2017-04-05 04:52:08 +00:00
9e0bb0561c cli: Preserve order of environment variables
Unless we are adding or removing environment variables, their order
shouldn't be changed. This makes it look like the service's TaskSpec has
changed relative to the old version of the service, and containers need
to be redeployed.

The existing code always rebuilds the list of environment variables by
converting them to a map and back, but there's no reason to do this if
no environment variables are being added.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: b426741c1504d45d0e1dd6d76ec5144bd95aa480
Component: engine
2017-04-04 18:16:57 -07:00
964a70f1c3 Add hidden placeholder of .Self for docker node ls --format
This commit adds a hidden placeholder of `.Self` for
`docker node ls --format` so that if the node is the same
as the current docker daemon, then a `*` is outputed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7328ae12cc3e14b3eb6ab01f09f6d94a82a44066
Component: engine
2017-04-04 12:46:44 -07:00
3692f9bbbf added unit tests for package cli/command/secret
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 243a8e69ff6141a27fb2e56e1101fb2e70822ab4
Component: engine
2017-04-04 15:35:08 -04:00
c7270d4d81 Add --format for docker node ls
This fix tries to address the comment https://github.com/docker/docker/pull/30376#discussion_r97465334
where it was not possible to specify `--format` for `docker node ls`. The `--format` flag
is a quite useful flag that could be used in many places such as completion.

This fix implements `--format` for `docker node ls` and add `nodesFormat` in config.json
so that it is possible to specify the output when `docker node ls` is invoked.

Related documentations have been updated.

A set of unit tests have been added.

This fix is related to #30376.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 32e21ecbfe3af9a8b5762ad1a549518221c4939e
Component: engine
2017-04-04 11:26:35 -07:00
a23d7a9c18 Merge pull request #30813 from yongtang/30232-service-ls-ports
Add `PORTS` field for `docker service ls` (`ingress`)
Upstream-commit: fe4d7db1eceae8aad6a27d0ce4164ae4bf974346
Component: engine
2017-04-04 17:04:27 +02:00
914851bace Merge pull request #32333 from dnephin/fix-endpoint-mode
Fix endpoint mode loading from Compose file in stack deploy
Upstream-commit: 93ffbb76c3286d96d693c6232ad39db6bcfafc66
Component: engine
2017-04-04 14:12:26 +02:00
ac33a30857 Merge pull request #32015 from dperny/service-logs-support-task-logs
Add Support for Service Task Logs
Upstream-commit: 170be9c26745b953dbfc5cafdc63eb3895c2c541
Component: engine
2017-04-04 00:15:13 -07:00
93e346635c 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: d330dc3223df7e6c2b066373718709e34e19efca
Component: engine
2017-04-03 18:40:54 -07:00
881ae30412 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: c877c7b2bf0ed20ff9054dcbec98362d9e88c145
Component: engine
2017-04-03 18:40:15 -07:00
84fd8f0bc0 Merge pull request #31144 from aaronlehmann/synchronous-service-commands
Synchronous service create and service update
Upstream-commit: 21ec12b9676f95aaa69c3082b97d0b10031cc90a
Component: engine
2017-04-03 17:44:03 -07:00
31fe55c058 Fix endpoint mode in Compose format.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 25f00866e3c0ec1d74c717d4e5974611479dc8ad
Component: engine
2017-04-03 17:51:31 -04:00
e84d96f81f 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: 330a0035334871d92207b583c1c36d52a244753f
Component: engine
2017-04-03 09:46:01 -07:00
a2c8d31405 Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode
cli: Wrong error message from "node ps" outside swarm mode
Upstream-commit: d9c3c1928d6089f0bc064cd0032b82505133231d
Component: engine
2017-04-03 16:15:24 +02:00
1156f2a813 Merge pull request #32282 from mstanleyjones/improve-attach-desc
Clarify meaning of docker attach
Upstream-commit: 571e4031685e730ba7cb0c49620e9f9580fdabc6
Component: engine
2017-04-01 20:52:26 +02:00
e0362b90f0 Merge pull request #31022 from jmzwcn/issue30994
docker version output is not consistent when there are downgrades or incompatibilities #30994
Upstream-commit: 3dfce9fbb813511a0dbfea1fa3bc80a37e7072c4
Component: engine
2017-03-31 15:55:03 -07:00
1d7af76811 Merge pull request #31800 from ripcurld0/checkpoint_ls
Use formatter in docker checkpoint ls
Upstream-commit: e45483964fc26116afa754fc9defcf1ab1dbca26
Component: engine
2017-03-31 15:54:22 -07:00
aa11c20963 Clarify meaning of docker attach
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 1922eac4cc7190e1f3fa98796e7613c3e5b8b2bd
Component: engine
2017-03-31 13:22:21 -07:00
8ae037ac7f Merge pull request #31599 from ripcurld0/diff_cmd_format
Use formatter in docker diff
Upstream-commit: 3d31198cda7d1230415b37970172480b5190c1e3
Component: engine
2017-03-31 11:19:41 -07:00
61743ec730 Merge pull request #32124 from vdemeester/system-inspect-secret
Add support for `--type=secret` in `docker inspect`
Upstream-commit: ee61f28cc37d78cd40943c37c24716e5a0a635d9
Component: engine
2017-03-30 17:01:57 +02:00
d3486384e9 Use formatter in docker diff
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 3dad39b957a008127890ddf9037c063d69b99347
Component: engine
2017-03-30 10:33:40 +03:00
2fba778d82 Docker version output is not consistent when there are downgrades or incompatibilities.
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: 50aa1e5b2819ea739beaa58bfe7836c2c8b4b9ff
Component: engine
2017-03-29 21:53:19 +08:00
487d9cf34a 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: bce494f7a2ce0e1a2c6563b2e32e5a8bacb128ba
Component: engine
2017-03-29 13:36:32 +02:00
dbb9dec606 Merge pull request #32186 from aaronlehmann/cluster-omitempty
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
Upstream-commit: 4180211d808c74682636f98ed16cd1990c842fc2
Component: engine
2017-03-29 10:38:52 +02:00
65370eec05 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: 3894254dddc56bf283d7361dc88953a167a3be1f
Component: engine
2017-03-28 14:20:25 -07:00
82e98876ed Add entrypoint flags to service cli.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d3ea30de1005fdf8fe95e9b0bc9fc5dae9b025b1
Component: engine
2017-03-28 11:24:19 -07:00
b8233dd3d5 Merge pull request #30810 from allencloud/make-secret-ls-support-filter
make secret ls support filters in CLI
Upstream-commit: 4df350b8c7a53dc82d8a6e187882faf8f90ce766
Component: engine
2017-03-28 13:43:19 +02:00
3f0713bbb1 Add support for --type=secret in docker inspect
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 71129f6be6c143b8210636f8bbb11a7c86b42cb6
Component: engine
2017-03-28 10:48:48 +02:00
69182c0d50 Merge pull request #31709 from dnephin/better-errors
Replace fmt.Errorf() with errors.Errorf() in the cli
Upstream-commit: 99aaf6b9233d0a0a577e79f536288bca36794c50
Component: engine
2017-03-28 10:17:46 +02:00
d247c210cb 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: 4155343f444c2fc6204447d0102a640425636e6c
Component: engine
2017-03-28 09:46:05 +02:00
37e3d52b2f Do not replace fmt.Errorf in generated file
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0d088186536aa480eea92f55f33ee41f66cec1a3
Component: engine
2017-03-27 18:33:41 -07:00
5f5b8fe9f6 Manually reorganize import paths to segregate stdlib and 3rd-party packages
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: febbe3879695c46d243ce806713038e0c1582806
Component: engine
2017-03-27 18:21:59 -07:00
51025ebc27 Merge pull request #31714 from aboch/cingr
Allow user to replace ingress network
Upstream-commit: 04295d26df3034a9a92da8400418f843d7c48780
Component: engine
2017-03-27 07:30:42 -07:00