docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
27,682 Commits 12 Branches 297 Tags
bcbed9fbcc0e46ed7ee357943d02b7f00c6c74ae
Commit Graph

27682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tonis Tiigi
bcbed9fbcc Don’t attempt to reconnect swarm on failed join after timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7381c84bfb9d586a5a7b87a9d6bcaf3ee15a4256
Component: engine
 2016-10-03 13:38:01 -07:00
Victor Vieux
33a6443775 Merge pull request #27119 from vieux/fix_doc_delete_service 
fix API doc service delete
Upstream-commit: 94cd7ed72d8554862b6f2f07ed4f5ee8a4dd3ede
Component: engine
 2016-10-03 12:03:45 -07:00
Brian Goff
f4148f6920 Merge pull request #26960 from allencloud/make-remove-cloudprovider-network-return-204 
make remove cloudprovider network return 204
Upstream-commit: 8b416fb0256c619c0ea6ac5c8efd94187f446cdd
Component: engine
 2016-10-03 14:46:11 -04:00
Brian Goff
674e83fb8c Merge pull request #27085 from alexchenfeng/master 
add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT C…
Upstream-commit: ce64a9bffd8f0411bbd34f6ea690b7e129898b02
Component: engine
 2016-10-03 14:23:07 -04:00
Michael Crosby
b172aee005 Merge pull request #27078 from darrenstahlmsft/InteractiveRestartTest 
Increase timeout in TestRunInteractiveWithRestartPolicy
Upstream-commit: e22d4b9654620da086a6e90b95427ba6a7ef4422
Component: engine
 2016-10-03 11:22:33 -07:00
Brian Goff
4c9f39efcc Merge pull request #26967 from AkihiroSuda/rename-tests 
[nit] integration-cli: obey Go's naming convention
Upstream-commit: 7e29b33546098816d5dbc1fc429e868f02b69e44
Component: engine
 2016-10-03 09:52:04 -04:00
Tõnis Tiigi
a3df8d8c65 Merge pull request #27094 from allencloud/add-lock-in-libcontainerd-client 
add lock in libcontainerd client AddProcess
Upstream-commit: 675e6224329dd46a8e5e52d7035da88fc97def94
Component: engine
 2016-10-02 16:50:41 -07:00
Sebastiaan van Stijn
84ce717a7a Merge pull request #27097 from albers/completion-node-ps-multiple-nodes 
Add support for multiple nodes in bash completion for `docker node ps`
Upstream-commit: 367d5b02322b8211c18b95faba1527ec591045f5
Component: engine
 2016-10-02 14:38:46 +02:00
Sebastiaan van Stijn
9ec0f309fb Merge pull request #27096 from albers/completion-daemon--init-path 
Add bash completion for `dockerd --init-path`
Upstream-commit: eca5ff194feca36acb6f6958f27a92eb74d86716
Component: engine
 2016-10-02 14:37:13 +02:00
Vincent Demeester
3d025590b1 Merge pull request #27060 from yongtang/27021-inspect-show-env 
Disable HTML escaping for JSON strings in `docker inspect`
Upstream-commit: 420e22fad4dcdff3b8025666216cc85fc9358f69
Component: engine
 2016-10-02 14:32:56 +02:00
Harald Albers
9f3299176f Add support for multiple nodes in bash completion for docker node ps 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9aeb69a0690d0d26bd3dea344f675b22f9ceda19
Component: engine
 2016-10-02 05:18:32 -07:00
Harald Albers
22e87ff2f2 Add bash completion for dockerd --init-path 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d710a3e1f8d1ffeeb141a08806e18623a36d2248
Component: engine
 2016-10-02 05:10:00 -07:00
allencloud
455b5fdd43 add lock in libcontainerd client AddProcess 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 278273bc1699873304240a6eca342b54051e2f23
Component: engine
 2016-10-02 00:36:25 +08:00
allencloud
9a44b50701 make remove network return 204 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ea07ef7a7c3a221d6167cc2e36806ed9615ac973
Component: engine
 2016-10-01 19:50:40 +08:00
Sebastiaan van Stijn
8585d1a8a3 Merge pull request #26564 from miminar/prevent-blob-uploads 
Avoid unnecessary blob uploads
Upstream-commit: 762556c705e96749bba34b7e32a7f464186ccd41
Component: engine
 2016-10-01 12:53:10 +02:00
Vincent Demeester
51ec6bcf96 Merge pull request #27062 from yank1/Inconsistency-"on_failure"-vs-"on-failure" 
Fix conversion of restart-policy from GRPC
Upstream-commit: 6e8a2cd29113896acfc3f97a43dd27f751f2f519
Component: engine
 2016-10-01 10:39:00 +02:00
Victor Vieux
b0dfc9bb7f fix API doc service delete 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a12120e78c5852d5571da38e7b9e4cd49f41edc3
Component: engine
 2016-09-30 22:31:40 -07:00
Arnaud Porterie
dcd98584e4 Merge pull request #26108 from mlaventure/data-mngt 
New Data Management commands
Upstream-commit: 86de7c000f5d854051369754ad1769194e8dd5e1
Component: engine
 2016-10-01 03:17:18 +00:00
alexchen
707bb1cca6 add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT CONFIG_IP_VS_RR in contrib/check-config.sh 
Signed-off-by: alexchen <alexchenunix@gmail.com>
Upstream-commit: 4c74469d30a71c53cc6b309a3c0048191b1ac008
Component: engine
 2016-10-01 09:50:17 +08:00
Michael Crosby
508d829cee Merge pull request #26968 from darrenstahlmsft/TestEventsFix 
Limit conccurent container creates in TestEventsLimit to 8
Upstream-commit: 18338427ed4573a1b4bcf57654dac59e6da6c215
Component: engine
 2016-09-30 16:29:01 -07:00
Darren Stahl
d14cd42778 Increase timeout in TestRunInteractiveWithRestartPolicy 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 6eac29490f9bffcb21525f9fcba389ac3dc89e85
Component: engine
 2016-09-30 15:30:18 -07:00
Brian Goff
859a595848 Merge pull request #27075 from tonistiigi/copy-error-reporting 
Fix error reporting in `CopyFileWithTar`
Upstream-commit: 6de38ebc4dfbea0f4a805a6baee109b4c830c272
Component: engine
 2016-09-30 18:14:13 -04:00
Darren Stahl
4136664b0a Limit conccurent container creates in TestEventsLimit to 8 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 728a26519051561da7d0310911831955fa42b1d5
Component: engine
 2016-09-30 14:44:05 -07:00
Sebastiaan van Stijn
465b6ed553 Merge pull request #27049 from dnephin/fix-label-flag-type 
Use ListOpt for build labels
Upstream-commit: 1b944a3025ba1eb1bfb86ed6393b7fe33de40eb6
Component: engine
 2016-09-30 23:40:08 +02:00
Kenfe-Mickael Laventure
881a82ffc0 Add documentation for container, volume, image and system prune subcommands 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 913e5cb77bcb7134be2e9b1aaa7e63627285e676
Component: engine
 2016-09-30 14:35:23 -07:00
Kenfe-Mickael Laventure
1de35edb56 Document new /system/df and /{containers,volumes,images}/prune API EndPoints 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: a860d5db451f4cab4e49a831139ddcf554de52a2
Component: engine
 2016-09-30 14:35:23 -07:00
Kenfe-Mickael Laventure
27aa54380b Add new df subcomand to the system command 
This command display the state of the data usage of the docker daemon.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: b650a7bd27dcdbb4cddbfdc2cf62f41b5a8e8652
Component: engine
 2016-09-30 14:35:23 -07:00
Tonis Tiigi
5f25d3f4ea Fix error reporting in CopyFileWithTar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 57e12037ac8f8eb48cc05979c3030853d011dfea
Component: engine
 2016-09-30 11:46:37 -07:00
Brian Goff
7f3def0be4 Merge pull request #27072 from Microsoft/jjh/fix26843 
Windows: Don't resolve volume dest
Upstream-commit: d89fb40e1ce1373e3b188b9a817fcf9a5f37cd13
Component: engine
 2016-09-30 14:46:07 -04:00
Michael Crosby
f44fc82a36 Merge pull request #26961 from Microsoft/jjh/oci 
Windows: OCI runtime spec compliance
Upstream-commit: 97660c6ec55f45416cb2b2d4c116267864b62b65
Component: engine
 2016-09-30 10:13:57 -07:00
Michael Crosby
1e2592ec36 Merge pull request #26997 from tonistiigi/exec-env 
Fix missing hostname and links in exec env
Upstream-commit: 6eef2b2ada0ee7657b3821af055d8fb337d682f4
Component: engine
 2016-09-30 09:51:02 -07:00
John Howard
e59d7b9406 Windows: Don't resolve volume dest 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3838c314add208a57003611a6963784435863330
Component: engine
 2016-09-30 09:40:15 -07:00
Justin Cormack
dc025b4907 Merge pull request #27051 from tophj-ibm/fix-installing-apparmor 
Fix apparmor profile installation
Upstream-commit: 50856a2ce29a8cd4ecd22a3ba8f6274c2ba6977c
Component: engine
 2016-09-30 17:38:20 +01:00
Vincent Demeester
fc5500f19e Merge pull request #26697 from allencloud/change-service-scale-logic 
validate service parameter in client side to avoid api call in `docker service scale`
Upstream-commit: 4fabc92cfc0670851851ebfb0f12d037059e6be1
Component: engine
 2016-09-30 18:37:35 +02:00
Vincent Demeester
0ffd096b11 Merge pull request #27059 from yongtang/26964-docs-service-ps-filter-misc 
Update docs for node filter of `docker service ps`
Upstream-commit: c9a0dda586481ec7acdeec36497ba726475059ad
Component: engine
 2016-09-30 16:15:49 +02:00
Yong Tang
3f16b8db80 Update docs for node filter of docker service ps 
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.

This fix updates the related docs for that.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c326e0afe39d19a789f0819cb3d81259167a762f
Component: engine
 2016-09-30 05:37:14 -07:00
Kay Yan
2062fd3e44 Fix conversion of restart-policy from GRPC 
restart-condition for services from "on_failure" to "on-failure".

Since GRPC does not support dashes in properties, this change
added a conversion when _setting_ the restart-condition.

However, when inspecting a service, no conversion took place
from the internal GRPC value, resulting in "on_failure" to
be shown.

This change updates the conversion to fix this, and removes
a "hack" that was previously used for this, now using a
Switch to compare to actual types.

Before this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on_failure","MaxAttempts":0}

Afer this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on-failure","MaxAttempts":0}

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
Upstream-commit: bc32fcabebb5f3a83d47c00d85317ce82c963edf
Component: engine
 2016-09-30 15:54:47 +08:00
Akihiro Suda
ed910442b7 [nit] integration-cli: obey Go's naming convention 
No substantial code change.

 - Api         --> API
 - Cli         --> CLI
 - Http, Https --> HTTP, HTTPS
 - Id          --> ID
 - Uid,Gid,Pid --> UID,PID,PID
 - Ipam        --> IPAM
 - Tls         --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)

Didn't touch in this commit:
 - Git: because it is officially "Git": https://git-scm.com/
 - Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
 - Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 7fb7a477d79c67ab53c432977780662ccbfeec57
Component: engine
 2016-09-30 01:21:05 +00:00
Yong Tang
e6c766802a Disable HTML escaping for JSON strings in docker inspect 
This fix tries to address the issue raised in 27021 where
HTML strings like (`&, >, <, etc`) in environmental variables
are escaped for JSON output for `docker inspect`. For example,
`TEST_ENV="soanni&rtr"` has been escaped to `TEST_ENV="soanni\u0026rtr"`

This fix disabled HTML escaping with `SetEscapeHTML`, which is available
since golang 1.7.0. This changes will be applied to all JSON output
that utilize `httputils.WriteJSON`.

An integration test has been added to cover the changes.

This fix fixes 27021.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0fa20ad13b0b5c6d1bf8a8285717c07697d079ba
Component: engine
 2016-09-29 18:16:36 -07:00
Christopher Jones
c15d8c9103 Fix apparmor profile installation 
Fixes #26823

Fixes an issue where apparmor was not loaded into the kernel, because
apparmor_parser was being called incorrectly.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 1a702111c61076e14f0e7ae688d0102128233daf
Component: engine
 2016-09-29 18:47:20 -05:00
Daniel Nephin
373fe94987 Use ListOpt for labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6c3b44f755cbf2564171a012fc55942862f3ede9
Component: engine
 2016-09-29 17:59:52 -04:00
Tonis Tiigi
3616bb2973 Fix missing hostname and links in exec env 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e98145960988a2259074ae911b6478b7a940748b
Component: engine
 2016-09-29 13:46:10 -07:00
Michael Crosby
200598ef34 Merge pull request #26994 from Microsoft/jjh/fix26461regression 
Windows: Don't set PATH/TERM on exec
Upstream-commit: 1d669d82c1d5691f9706112acdbe4f70812cf6aa
Component: engine
 2016-09-29 13:34:12 -07:00
Misty Stanley-Jones
12eed3d798 Merge pull request #27036 from mstanleyjones/fix_labels_nav 
Fix menu position of the labels-custom-metadata.md topic
Upstream-commit: a3286783bcfbfd6e58d16e1b189138580b08facc
Component: engine
 2016-09-29 11:04:46 -07:00
Misty Stanley-Jones
1b063e8490 Fix menu position of the labels-custom-metadata.md topic 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 9e012210484b3adda78e872bb45c54956d108c13
Component: engine
 2016-09-29 10:51:08 -07:00
Sebastiaan van Stijn
e521f9c3b8 Merge pull request #27031 from mstanleyjones/fix_broken_image_link 
Revert "Add direct link to event chart image"
Upstream-commit: 6f07a4a69b17d6a1bf902a5ec30ad046645e9c23
Component: engine
 2016-09-29 19:21:30 +02:00
Misty Stanley-Jones
54d60e9c2d Revert "Add direct link to event chart image" 
This reverts commit 86de72fef244b3fe209e5793deb40fb26f5b318e.

The link seems malformed and is breaking the overall docs build.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 23207def7c4a390fe3549f467413c187cc146fee
Component: engine
 2016-09-29 10:16:41 -07:00
Vincent Demeester
a3bb730c44 Merge pull request #24411 from vdemeester/24393-ps-filter-managed 
Add a new "is-task" ps filter
Upstream-commit: b6ad6d98fd5037c44cc38d000e5a35bd808bff7d
Component: engine
 2016-09-29 18:54:15 +02:00
Tõnis Tiigi
f5d10e642f Merge pull request #27007 from allencloud/better-node-inspect-pretty 
add \n in engine labels display in docker node inspect xxx --pretty
Upstream-commit: c29eee6e20b7818e8abf749fe57c46fa3d865f94
Component: engine
 2016-09-29 09:53:59 -07:00
Tõnis Tiigi
e79106b452 Merge pull request #27024 from LK4D4/fix_servic_healthtest 
integration: wait for task running in TestServiceHealthRun
Upstream-commit: 5bfe493d93239d20c37695ae4df532a1f8ae16b1
Component: engine
 2016-09-29 09:53:02 -07:00