Commit Graph

31121 Commits

Author SHA1 Message Date
Harald Albers a0d87aba08 Move bash completion logic to new subcommand: stats
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 19f31f8e481e00fe2f19e5341696e7f810d2bbb2
Component: engine
2016-10-21 12:39:32 +02:00
Harald Albers 0eda6f996b Move bash completion logic to new subcommand: start
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2bbfd01e7a0e70fcbfdc756c393a8d8aef217d76
Component: engine
2016-10-21 12:39:32 +02:00
Harald Albers e43240c557 Move bash completion logic to new subcommand: run
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5200d18dbf8abf9171818db735a23f87978008bc
Component: engine
2016-10-21 12:39:32 +02:00
Harald Albers 15649f5936 Move bash completion logic to new subcommand: rm
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9fc4670b3b1f83adc04230619c9181b7d6b4ccce
Component: engine
2016-10-21 12:39:32 +02:00
Harald Albers fa16e189ad Move bash completion logic to new subcommand: restart
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 58027826d4fb1b87a59b8f1a6e2b23780f389619
Component: engine
2016-10-21 12:39:32 +02:00
Harald Albers 0629b87f8c Move bash completion logic to new subcommand: port
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 96547d0e88250ac009d1c73cc9b61ae88452ae27
Component: engine
2016-10-21 12:39:32 +02:00
Harald Albers 5b1ad7b5a9 Move bash completion logic to new subcommand: port
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 48e75d4bc2cbe2bf3414613262eab0b5dc585555
Component: engine
2016-10-21 12:39:32 +02:00
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Antonio Murdaca 32b1cab2c4 api/server/router/system: fix info versioning
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 63b5a372037081175ab4ea8f3c7a7bef2195ec0b
Component: engine
2016-10-21 12:32:23 +02:00
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
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
yuexiao-wang e924961e4f Update the subtitle for stack ps
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 98fb1644c2b9bf7d808a3d75de5997f87b9c60e6
Component: engine
2016-10-21 16:47:21 +08:00
Evelynhsu a9bf94a379 remove duplicated error judgement in cluster.go
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 75c51ad76b0b5995e9349cb369c9e8664f40855c
Component: engine
2016-10-21 14:28:10 +08: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
allencloud 5e6ef3def9 revendor go-units to update more accurate time display
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 3cff9e0267780427b74f1b106798d9bb3c112eb2
Component: engine
2016-10-21 11:05:11 +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
Carlos Alexandro Becker 4cc0262d8c added editorconfig
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
Upstream-commit: 962f3479239b2dd5bfd960bc3a35199a49371d8e
Component: engine
2016-10-20 22:18:16 -02:00
Tonis Tiigi 6b04858e42 Refactor stdin closing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6f2658fb8cbaf5972c4c069817ed16e80d461514
Component: engine
2016-10-20 17:10:15 -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
Tonis Tiigi 5c4198ba60 Fix issues with fifos blocking on open
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6d26464502b4e8ecfd8f5605196605624fb79944
Component: engine
2016-10-20 17:02:02 -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
Tonis Tiigi f8d146b07d chroot: let root be cleaned up by kernel
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 70dfea63ba2a8a6d8b367420039aeb6a1759c240
Component: engine
2016-10-20 15:50:46 -07:00
Tonis Tiigi 253426676c chroot: remount everything as private in new mntns
If parent of the destination path is shared, this
path will be unmounted from the parent ns even if
the path itself is private.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b511d1f0cabd32ca30c87fa1bbc7ecac283dab39
Component: engine
2016-10-20 15:29:23 -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
Daniel Nephin 8db7952fdf Update volume type and regenerate types
generation fixed some comments.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7e7d0ab5e60ed680b8ef0461403eb2eea35cb448
Component: engine
2016-10-20 13:31:32 -07:00
Daniel Nephin 9a717de600 Exclude generated types from linting.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4bfa2e634cec20685760abbeb605bcf1426f41d0
Component: engine
2016-10-20 13:24:23 -07:00
Daniel Nephin 0220fa6540 Generate plugin types from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6f7b69b63f172e9c687416ac1445b2c016f39ff6
Component: engine
2016-10-20 13:24:23 -07:00
Daniel Nephin 3f110de0ac Add whitespace and create a script to run generation
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 02e1ffd76c517f8b9832fada9ba31445f90f2d7f
Component: engine
2016-10-20 13:24:23 -07:00
Daniel Nephin b8b81c7fa0 Generate api/types:Image from the swagger spec
and rename it to a more appropriate name ImageSummary.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b06c3527831a585ac7e44d0b3ea060cc2092e6ef
Component: engine
2016-10-20 13:24:23 -07:00