507fa2bf07
Move bash completion logic to new subcommand: pause
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 27abd030591d7b5e3b9718c967ab283def411d1e
Component: engine
2016-10-21 12:39:32 +02:00
35fce53c94
Move bash completion logic to new subcommand: ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a91fb558d2c7e7958baad19db0950fa6312ae47d
Component: engine
2016-10-21 12:39:32 +02:00
b52b64a1cb
Move bash completion logic to new subcommand: logs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4dedad31182bacde2074578e6e5520d8fb7619bb
Component: engine
2016-10-21 12:39:32 +02:00
75140aa68c
Move bash completion logic to new subcommand: kill
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f1e12a495148852da2cc1d96b750ee496d3a2d0b
Component: engine
2016-10-21 12:39:32 +02:00
98b9915bd0
Move bash completion logic to new subcommand: inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3cd9f226649c527fcc1a8bdffdeb7005b7084077
Component: engine
2016-10-21 12:39:32 +02:00
02c1a5c4e0
Move bash completion logic to new subcommand: diff
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3b6f6611b04eee06c77d578ba9d8ea6346eadb8c
Component: engine
2016-10-21 12:39:32 +02:00
afd1a1c262
Move bash completion logic to new subcommand: exec
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8fde0d7f2b6822e82220a37a055f3f772036bf8b
Component: engine
2016-10-21 12:39:32 +02:00
f441b12ee3
Move bash completion logic to new subcommand: diff
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f15debe56c918f74a23c230e6346635fe90bd553
Component: engine
2016-10-21 12:32:08 +02:00
c47611895a
Move bash completion logic to new subcommand: create
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: cd4a490b3f7a53a89d538e1f0eb92eda75af0519
Component: engine
2016-10-21 12:32:08 +02:00
103a2934c7
Move bash completion logic to new subcommand: cp
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 939a97f7acc14b9104159d7d2e8489c517774fdb
Component: engine
2016-10-21 12:32:08 +02:00
abbc542480
Move bash completion logic to new subcommand: commit
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6a0dff0a9a17aeeabb84aedd2c37008ca93f4a82
Component: engine
2016-10-21 12:32:08 +02:00
da37072dda
Move bash completion logic to new subcommand: attach
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dc5794b3060f51470998b11bb5b34d9efbe97dc3
Component: engine
2016-10-21 12:32:08 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
