docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
28,050 Commits 12 Branches 297 Tags
91e3d19aab508ee69fd41a93b134e201fdd66fb4
Commit Graph

28050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harald Albers
91e3d19aab Add bash completion for docker container 
At this point, we just delegate to the existing completions.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a77bc8bbcf8acc40f26bd858e937a7154977943c
Component: engine
 2016-10-21 12:32:08 +02:00
Sebastiaan van Stijn
de91595c7f Merge pull request #27617 from lixiaobing10051267/masterUserGuide 
fix wrong location for network related doc files
Upstream-commit: 44dc9ef602bbf8c4daa9fa264ee0ccb25f473656
Component: engine
 2016-10-20 22:28:43 -07:00
Aaron Lehmann
6c158febcb Merge pull request #27613 from stevvooe/archive-package-cleanup 
pkg/archive: remove unnecessary Archive and Reader type
Upstream-commit: bc52939b0455116ab8e0da67869ec81c1a1c3e2c
Component: engine
 2016-10-20 20:56:23 -07:00
lixiaobing10051267
f2a96efba0 fix wrong location for network related doc files 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: c0260766588ed4c2c82cca2384d8ae30ac10b362
Component: engine
 2016-10-21 11:27:24 +08:00
Sebastiaan van Stijn
dda143061b Merge pull request #27531 from AkihiroSuda/nit-api125-changelog 
[nit] add missing changes in API v1.25 (prune) to docker_remote_api.md
Upstream-commit: 015c2d32ee8f963065fde9755fb62dc8ff44cc19
Component: engine
 2016-10-20 19:37:15 -07:00
Stephen J Day
fe1dce6a91 pkg/archive: remove unnecessary Archive and Reader type 
The `archive` package defines aliases for `io.ReadCloser` and
`io.Reader`. These don't seem to provide an benefit other than type
decoration. Per this change, several unnecessary type cases were
removed.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: aa2cc18745cbe0231c33782f0fa764f657e3fb88
Component: engine
 2016-10-20 19:31:24 -07:00
Victor Vieux
593f92302a Merge pull request #27564 from mlaventure/add-networks-format-to-ps 
Add Networks placeholder to ps --format
Upstream-commit: d98f995d7d191f8ae7ab0c442eed92f67faa305b
Component: engine
 2016-10-20 18:43:46 -07:00
Akihiro Suda
1a658fb45c add missing changes in API v1.25 (prune) to docker_remote_api.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: afb21776313eb88b7ca691e224832ddb28cb2bb3
Component: engine
 2016-10-21 01:33:08 +00:00
Tõnis Tiigi
2d76ea3864 Merge pull request #27530 from allencloud/change-join-role-display-judge 
change join node role judge
Upstream-commit: 392b816199836c6cd0fe214b157d70c77b72105b
Component: engine
 2016-10-20 17:46:08 -07:00
Aaron Lehmann
3b85a5f98c Merge pull request #27606 from stevvooe/no-pool-pointer 
pkg/pool: no need for double pointer for sync.Pool
Upstream-commit: 2e742b022190dbd0d2897b9c2bd3da2f045d708e
Component: engine
 2016-10-20 17:03:41 -07:00
Tõnis Tiigi
3578a3a9eb Merge pull request #27594 from aaronlehmann/vendor-swarmkit 
Vendor swarmkit and libnetwork in master
Upstream-commit: eee025ec9a2773ed2bd2fcca432912f9884d5b0c
Component: engine
 2016-10-20 16:33:28 -07:00
Sebastiaan van Stijn
f1cb35d664 Merge pull request #27593 from mstanleyjones/improve_develop_plugins 
Rewrites to Developing Plugins topic
Upstream-commit: 76200f1d0b7d8651fd68bf6a33518ec676508f95
Component: engine
 2016-10-20 15:55:42 -07:00
Stephen J Day
0f8d925c2d pkg/pool: no need for double pointer for sync.Pool 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 836f347cb04f28ee80bb5d877c5599f91ed1ef60
Component: engine
 2016-10-20 15:27:38 -07:00
Misty Stanley-Jones
9fcff3d320 Rewrites to Developing Plugins topic 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: b39e65e9378cf6a32bcc3ac3bd8b982d339ea25d
Component: engine
 2016-10-20 15:03:41 -07:00
Aaron Lehmann
0ce7aa426e Vendor swarmkit in master 
Also, update libnetwork and grpc.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 12a4ed03178982fec44b75479c3e63a316503d90
Component: engine
 2016-10-20 13:49:22 -07:00
Aaron Lehmann
56af301200 Merge pull request #27287 from mavenugo/pluginv2-sk2 
Allow multiple handlers to support network plugins in swarm-mode 
Upstream-commit: 2c620d0aa24c5f774a9115449a86b158b005bba8
Component: engine
 2016-10-20 13:43:04 -07:00
Misty Stanley-Jones
63025d814f Merge pull request #27560 from mstanleyjones/sync_docs_master 
Sync docker/docker refs with files mistakenly edited in docker.github.io repo
Upstream-commit: 790629c02168f712884f181a9392df36de7abc20
Component: engine
 2016-10-20 13:42:40 -07:00
Vincent Demeester
2f7fc91dd4 Merge pull request #27470 from runcom/expose-exec-pid 
record pid of exec'd process
Upstream-commit: 13fd75c3dd18e6d57b6b28097fd7e0d0989c1b9e
Component: engine
 2016-10-20 21:36:21 +02:00
Alexander Morozov
1943bac573 Merge pull request #22337 from allencloud/support-insecure-registry-config-reload 
support insecure registry in configuration reload
Upstream-commit: c18fbc945514f32379ac2638c3f4fff67e9aa040
Component: engine
 2016-10-20 11:41:23 -07:00
Misty Stanley-Jones
b2f3f16f09 Sync docker/docker refs with files mistakenly edited in docker.github.io repo 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 3b36f02c03ec050aa46f9a01cd2d6c60ffd93652
Component: engine
 2016-10-20 10:51:30 -07:00
Michael Crosby
0a853bdac1 Merge pull request #27556 from LK4D4/unify_install 
project: unify way of installing runc and containerd
Upstream-commit: ffa0446e8b8a190cb42f6ff6d54acb8d65995e49
Component: engine
 2016-10-20 10:13:40 -07:00
Aaron Lehmann
f52344ca81 Merge pull request #27516 from allencloud/change-remove-multi-nodes 
make every node and plugin removal call api
Upstream-commit: a67a9773055b757b8b5b7b6937a6983d023688bf
Component: engine
 2016-10-20 10:10:52 -07:00
Sebastiaan van Stijn
0c230bcf48 Merge pull request #27327 from flixr/deb_armhf_ubuntu-trusty_buildtags 
debian package: update buildtags for armhf ubuntu-trusty
Upstream-commit: 6698a66be705039f44688d4476f5016145184259
Component: engine
 2016-10-20 09:52:43 -07:00
Sebastiaan van Stijn
1a5c3c8100 Merge pull request #27569 from allencloud/change-created-description-api-change 
change created description in api change
Upstream-commit: b7950e072b70bfe61d14ed181023fca2c2e16ffe
Component: engine
 2016-10-20 09:18:45 -07:00
allencloud
5391fe7296 change created description in api change 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c37d6bf2a08c9ae05ebf16522b33b95d389642c1
Component: engine
 2016-10-21 00:10:16 +08:00
Alexander Morozov
e50d97d8c8 project: unify way of installing runc and containerd 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 179479c6cdf44a2fd3d4ba2ce5dc176bc22ca9bf
Component: engine
 2016-10-20 08:50:02 -07:00
Antonio Murdaca
dd35c23542 record pid of exec'd process 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 18083481361a4053d1081a201120a916239fc0ed
Component: engine
 2016-10-20 17:06:11 +02:00
Vincent Demeester
774705a707 Merge pull request #27514 from crosbymichael/update-init-oct18 
Update docker-init to 74341e923bdf06cfb6b70cf54089
Upstream-commit: a4125e2265ef8994e666af667e64b9a9a4133c73
Component: engine
 2016-10-20 16:58:26 +02:00
Vincent Demeester
0c6f5e2158 Merge pull request #27535 from YuPengZTE/dev 
Fix the typo of URLs
Upstream-commit: f529f2a0d527209bcf4bcded98057c5ae04b7256
Component: engine
 2016-10-20 16:51:50 +02:00
Vincent Demeester
31b0e9e411 Merge pull request #27465 from anusha-ragunathan/plugins_APIVer 
Add plugin API version.
Upstream-commit: e174a4358dd05f9ef6193912cd6a296ae2ba61b6
Component: engine
 2016-10-20 16:48:26 +02:00
Kenfe-Mickael Laventure
10784ca4ce Add Networks placeholder to ps --format 
Passing {{.Networks}} to the format parameter will prompt ps to
display all the networks the container is connected to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: a43d9bb9c399958e64deb5e827e6716ad1ef0e41
Component: engine
 2016-10-20 07:41:56 -07:00
Vincent Demeester
50b0849c18 Merge pull request #26671 from yongtang/25545-docker-volume-inspect-volume-options 
Show volume options for `docker volume inspect`
Upstream-commit: 78624ec81a3df2fd95df1a2902c5bc1fa9db0cd7
Component: engine
 2016-10-20 16:10:23 +02:00
Yong Tang
6b3066953c Show volume options for docker volume inspect 
This fix tries to address the issue raised in 25545 where
volume options at the creation time is not showed up
in `docker volume inspect`.

This fix adds the field `Options` in `Volume` type and
persist the options in volume db so that `volume inspect`
could display the options.

This fix adds a couple of test cases to cover the changes.

This fix fixes 25545.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9ce8aac55e6df65bbf49c682374871a94d379bf3
Component: engine
 2016-10-20 05:14:27 -07:00
Antonio Murdaca
54cf8aade9 Merge pull request #27558 from LK4D4/update_go 
project: update Go to 1.7.3
Upstream-commit: 11d52b085c58965a4c85b3f06bfa3d445f9dc398
Component: engine
 2016-10-20 14:13:41 +02:00
Vincent Demeester
7fbcf96052 Merge pull request #24594 from jwendell/24355 
Exec: Add ability to set environment variables
Upstream-commit: 1b677816f50d09650044a7dbda3807bddffdad8d
Component: engine
 2016-10-20 13:26:48 +02:00
Sebastiaan van Stijn
76d3fdc69b Merge pull request #27451 from vincentbernat/fix/zsh-complete-empty 
zsh: fix completion when docker output only has the header line
Upstream-commit: f6e9f71e706d0c456977a0a29a65ce52f63c49f9
Component: engine
 2016-10-19 23:34:16 -07:00
Sebastiaan van Stijn
64bb155742 Merge pull request #27534 from yuexiao-wang/fix-link-image-repo 
Update the link for sharing images via repositories
Upstream-commit: adaea58b205e8499c09b6ff35a912fd085ac890f
Component: engine
 2016-10-19 20:37:22 -07:00
Sebastiaan van Stijn
686178dec7 Merge pull request #27542 from albers/completion-comments 
Improve comments in bash completion
Upstream-commit: 5023d3aa7ae3fa76ee0679f5633a57259beb3b47
Component: engine
 2016-10-19 20:36:40 -07:00
allencloud
146d61be30 support insecure registry in configuration reload 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 582803f00addb597efbfc64a5143f2f848b76ae6
Component: engine
 2016-10-20 07:54:31 +08:00
Alexander Morozov
5d03410dc2 project: update Go to 1.7.3 
List of milestone issues https://github.com/golang/go/issues?q=milestone%3AGo1.7.3

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 7d8831c0914b8016daee5c0b90496b581d61522d
Component: engine
 2016-10-19 13:55:01 -07:00
yuexiao-wang
4fa4bc496e Update the link for sharing images via repositories 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: e1c849cc576cf2ee62fb91548aafb74f1a017d2c
Component: engine
 2016-10-20 01:39:41 +08:00
Tõnis Tiigi
5d48ce28d0 Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors 
Fix problems with wrapped errors in logrus
Upstream-commit: 9f30c28d2176b2822b7e66e4b0f462bb6a2cbe36
Component: engine
 2016-10-19 10:16:01 -07:00
Kenfe-Mickaël Laventure
fa4de7aaac Merge pull request #27550 from albers/completion-daemon--shutdown-timeout 
Add bash completion for `dockerd --shutdown-timeout`
Upstream-commit: 01736b9cbe7796e0856930bfce3c8fb82520b001
Component: engine
 2016-10-19 10:05:07 -07:00
Harald Albers
f4d76afea5 Add bash completion for dockerd --shutdown-timeout 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c24c1bd87f7e188012705b4d95c1f66ace59f44d
Component: engine
 2016-10-19 18:59:01 +02:00
Misty Stanley-Jones
5af5baf527 Merge pull request #27438 from yuexiao-wang/update-volume 
Update the link for understand data volumes
Upstream-commit: 2bf4a39161d0280066459d1059afbeb20e4eec8d
Component: engine
 2016-10-19 09:56:05 -07:00
yuexiao-wang
74ef1fda6a Update the link for understand data volumes 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b1c2d425e167e6f939a192c87a7a40f449f07e32
Component: engine
 2016-10-20 01:25:59 +08:00
Vincent Demeester
f6f92180d7 Merge pull request #23036 from yongtang/22471-daemon-shutdown-timeout-daemon 
Add config parameter to change stop timeout during daemon shutdown
Upstream-commit: 4a4f028c47046d9b166d35c631ae794000385b70
Component: engine
 2016-10-19 18:47:50 +02:00
Jonh Wendell
bf1e1cd730 Exec: Add ability to set environment variables 
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.

Example of usage: docker exec -it -e TERM=vt100 <container> top

Closes #24355.

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
Upstream-commit: e03bf1221ee2c863f25a57af4d415e2d8ff4f26c
Component: engine
 2016-10-19 12:39:25 -02:00
Vincent Demeester
e4a5c6f7fb Merge pull request #26965 from Microsoft/jjh/rootpath 
Windows: Set correct root path logic
Upstream-commit: 15fb3fd9da06c73c4efd88140f6fc12130f361a9
Component: engine
 2016-10-19 15:50:37 +02:00
Vincent Demeester
aaf05c1203 Merge pull request #27387 from talex5/health-restart 
Reset health status to starting when a container is restarted
Upstream-commit: 7a4d286ddd78aff567c21bdd0a54d7765488ca64
Component: engine
 2016-10-19 15:48:59 +02:00