toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,128 Commits 3 Branches 295 Tags
b88ef740b7fa555000220e2b6e36b8cb53a566f0
Commit Graph
31128 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester b88ef740b7 Merge pull request #31442 from lixiaobing10051267/masterBuildTest 
fix wrong foo to zzz in docker_cli_build_test.go
Upstream-commit: 72989415ac510e9a4657d1a30efafe26142a7dd6
Component: engine
 2017-03-01 11:51:44 +01:00
lixiaobing10051267 629b5cebad fix wrong foo to zzz in docker_cli_build_test.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2276de8704d9b235306b50be748afa98a574a5cb
Component: engine
 2017-03-01 17:49:54 +08:00
Tianon Gravi 3a92124ae2 Merge pull request #31076 from AkihiroSuda/check-vendor 
hack/validate/vendor: add more checks
Upstream-commit: 6e04fbf748a138419d28a85a4544379e8ae64310
Component: engine
 2017-02-28 15:35:16 -08:00
Sebastiaan van Stijn a316d511d2 Merge pull request #31425 from vieux/choose_cross 
pass DOCKER_CROSSPLATFORMS to the container in the Makefile
Upstream-commit: fe9ab0588606a5566d065bc68ae68f3926ddaa72
Component: engine
 2017-02-28 19:28:19 +01:00
Aaron Lehmann 0f39c7cf27 Merge pull request #31419 from thaJeztah/buffer-test-coverage 
Improve coverage of pkg/ioutils/buffer
Upstream-commit: b88429f8ca0c0ca2df8e8b393d9a90a3f96141de
Component: engine
 2017-02-28 10:19:54 -08:00
Victor Vieux 08d9b7c8f6 pass DOCKER_CROSSPLATFORMS to the container in the Makefile 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 8aa1158164d218dc8d63ec4dcedf7cd7b8b3f28c
Component: engine
 2017-02-28 10:14:19 -08:00
Sebastiaan van Stijn 43871b376a Merge pull request #31418 from thaJeztah/more-auto-assign 
Add more maintainers to "auto-assign"
Upstream-commit: d265590a9873cc9afb39aa46b89a4cd8a4147779
Component: engine
 2017-02-28 18:34:00 +01:00
Vincent Demeester aeb62e6edf Merge pull request #31384 from allencloud/validate-extrahosts-in-deamon-side 
validate extraHosts in daemon side
Upstream-commit: 40f390e67eead490fa0b8e1684fc2dc8528cd8c8
Component: engine
 2017-02-28 18:28:10 +01:00
Sebastiaan van Stijn abcd382ec2 Merge pull request #31354 from anusha-ragunathan/dial_socket 
Net dial to the plugin socket during enable.
Upstream-commit: e77c2001aacd7cb0dd2b59b9ac32763d029bfc0f
Component: engine
 2017-02-28 18:24:56 +01:00
Vincent Demeester 6737a970ea Merge pull request #31190 from albers/completion-hide-aliases 
Hide aliases in bash completion of `docker node|service`
Upstream-commit: ae00a139cbff649f9008ae5b8c801a12713f2eec
Component: engine
 2017-02-28 16:54:53 +01:00
Vincent Demeester 6581f592f2 Merge pull request #31290 from thaJeztah/print-d_type_warning 
add d_type warning to docker info, and optimize output
Upstream-commit: 38d985a1c120834647d15ac87fa2e3e40f0dd0aa
Component: engine
 2017-02-28 16:35:00 +01:00
Sebastiaan van Stijn cd4e1aa1f7 Add more maintainers to "auto-assign" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d10915ba6cbc534df6c1dd837e34d3c5097dbc25
Component: engine
 2017-02-28 14:39:48 +01:00
Lei Jitang 99a8a13c62 Merge pull request #31413 from lixiaobing10051267/masterRx 
update Reported less Txbytes to RxPackets in docker_api_stats_test.go
Upstream-commit: fdcc7879c8ca44d31dd9f0d4d2b536bdf1ecec71
Component: engine
 2017-02-28 21:20:39 +08:00
Sebastiaan van Stijn b785b21a18 Improve coverage of pkg/ioutils/buffer 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 392ece22398e7757d2bfdce57ef645ab5e92aa20
Component: engine
 2017-02-28 14:11:15 +01:00
Vincent Demeester 399e8679bb Merge pull request #30843 from vdemeester/daemon-duplication-refactor 
Few daemon duplication refactor
Upstream-commit: 98a1d9a7128025a2032d557303987a08fc89b17e
Component: engine
 2017-02-28 13:14:07 +01:00
lixiaobing10051267 1b55b3c201 update Reported less Txbytes to RxPackets in docker_api_stats_test.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 5690de3c0ed229c2de223aa023bd7a7ae2af0993
Component: engine
 2017-02-28 19:42:35 +08:00
Vincent Demeester 27f6b8793b Add a lockedManagerAction method to Cluster… 
… in order to remove duplication.
Each time we update a cluster object, we do some common
operations (lock, verify it's on a manager, get the request context,
and the update). This introduce a method and refactor few
update/remove method that allows to duplicate less code.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 250e05e42773a875d2fb8248b94fa72f2934a4b6
Component: engine
 2017-02-28 11:12:11 +01:00
Vincent Demeester 922530d28e Refactor cpu-realtime file creation to remove duplication 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f7819fcb25aaf5b08202db275847c825e7b09999
Component: engine
 2017-02-28 11:12:06 +01:00
Vincent Demeester df7fcfe4bc Reduce duplication in graphdriver 
Removes some duplication in counter.go and proxy.go

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2028d8698d95fb73f0c59a548b8f2adbdf5057a4
Component: engine
 2017-02-28 11:12:02 +01:00
Vincent Demeester 7a647c8187 Extract common code from disconnectFromNetwork and releaseNetwork 
Both method are trying to detach the container from a cluster
network. The code is exactly the same, this removes the duplication.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cb6832c6d34cdce33341c4f71ba8f22a23608c70
Component: engine
 2017-02-28 11:11:59 +01:00
Vincent Demeester 8762483acd Refactor publish/expose filter to remove duplication 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: af0d9bdfe4a50c4c691e2939cb08dfb05dfa3688
Component: engine
 2017-02-28 11:11:55 +01:00
Vincent Demeester f3e3af079e Introduce a CheckContainer to remove duplication 
Some methods need to get a container *and* validate some conditon on
these (is the container running, …). The CheckContainer allows
to do that and helps remove some duplication.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 12485d62eeba27119260dc5eb54ac4fa83c3130b
Component: engine
 2017-02-28 11:11:48 +01:00
Vincent Demeester 8b38b2a363 Refactor endpoint*FromGRPC to limit duplication 
endpointSpecFromGRPC and endpointFromGRPC do the exact same thing for
endpoint{,Spec}.Ports, let's extract that to a method.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a620c0172c6f11c538b27a26fdb3e5cdd3bf2ff9
Component: engine
 2017-02-28 10:51:55 +01:00
Vincent Demeester e64cb1f6c5 Remove daemon.VXSubnets duplicate code 
Refactor daemon.V4Subnets and daemon.V6Subnets to limit duplication

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3c5932086af51f57c497690ce3cf18a906b700cf
Component: engine
 2017-02-28 10:51:40 +01:00
Vincent Demeester f2e35d377c Merge pull request #31393 from aaronlehmann/vendor-swarmkit-46bbd41 
Vendor swarmkit 46bbd41
Upstream-commit: c956d25bfced952a40f001fe68c2e79eced3f200
Component: engine
 2017-02-28 09:40:20 +01:00
allencloud 37a58aacb7 validate extraHosts in daemon side 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d524dd95ccadf0b3dea2e04f5813abbc1423a84e
Component: engine
 2017-02-28 10:37:59 +08:00
Anusha Ragunathan 23ca2941d2 Net dial to the plugin socket during enable. 
When a plugin fails to start, we still incorrectly mark it as enabled.
This change verifies that we can dial to the plugin socket to confirm that
the plugin is functional and only then mark the plugin as enabled. Also,
dont delete the plugin on install, if only the enable fails.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 1b41b7a4f4c824bbfdb1acac3e8c8505e0fdb84f
Component: engine
 2017-02-27 18:11:28 -08:00
Tibor Vass ff610fa837 Merge pull request #31343 from aboch/vnd 
Vendoring libnetwork @bdc9dce 
Upstream-commit: 7fb83eb7629856756e3ed7b1f20cedc87584354b
Component: engine
 2017-02-27 15:06:03 -08:00
Victor Vieux 02cf046859 Merge pull request #31388 from ddingel/s390_add_yakkety 
Add support for s390x ubuntu-yakkety deb
Upstream-commit: 406addf3f7d08cb4da92ac4e86560095567dc96b
Component: engine
 2017-02-27 14:22:53 -08:00
Sebastiaan van Stijn 0e38ed3ec3 Merge pull request #31398 from pjaffe/patch-1 
Remove incorrect duplicate phrase from build.md
Upstream-commit: fb5ccc66054df1459d7844e237a2aaae085ec274
Component: engine
 2017-02-27 23:08:47 +01:00
pjaffe 2fe0398b28 Remove incorrect duplicate phrase from build.md 
A phrase from the "Text files" section in build.md was incorrectly duplicated under the "Tarball contexts" section.

Signed-off-by: Peter Jaffe <pjaffe@nevo.com>
Upstream-commit: 76235635753fd37e8f94ecc01088a12dc550d2e1
Component: engine
 2017-02-27 17:05:24 -05:00
Anusha Ragunathan fc85392e4c Merge pull request #31071 from anusha-ragunathan/plugin_filter_network 
Service creation using network plugin filters.
Upstream-commit: 52ce5c254880663e103e4e25f99700151ee6c2f8
Component: engine
 2017-02-27 11:59:11 -08:00
Aaron Lehmann dfcca19d95 Vendor swarmkit 46bbd41 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 99119fcafa41fb8c95e67b225a3da2902ce0e959
Component: engine
 2017-02-27 11:51:00 -08:00
Sebastiaan van Stijn 5b86384220 Merge pull request #31314 from williamh/split-openrc-log 
contrib/init/openrc: allow separate logs for stdout and stderr
Upstream-commit: 8b6ae13c08ba9b649db463bbb92eade754df3e29
Component: engine
 2017-02-27 19:31:57 +01:00
Vincent Demeester ff0d7abdb3 Merge pull request #31382 from albers/completion-build--add-host 
Add bash completion for `docker build --add-host`
Upstream-commit: ce79f6b644fe9c56fab9701cbff872706278ab60
Component: engine
 2017-02-27 15:25:12 +01:00
Dominik Dingel e678ceeeb0 Add support for s390x ubuntu-yakkety deb 
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Upstream-commit: 7f54153ba868b55c79e86bfcff196df46b6c9017
Component: engine
 2017-02-27 14:52:43 +01:00
Harald Albers b0b1bed2ba Add bash completion for docker build --add-host 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8de3eb048658f54e4c1d95a9523130bbc33106c4
Component: engine
 2017-02-27 12:56:57 +01:00
Sebastiaan van Stijn 12aa0347d6 Merge pull request #30383 from TDAbboud/30096-add-host-docker-build 
Add --add-host for docker build
Upstream-commit: a64ea37753fd9a94dfa3ab81f67f46df7bd641f8
Component: engine
 2017-02-27 12:42:18 +01:00
Akihiro Suda 458406a7f3 Merge pull request #31212 from fate-grand-order/fixed 
use t.Fatal() to output the err message and fix typo
Upstream-commit: a6576b8a2bff0feeb67918403caa3df0c4c37673
Component: engine
 2017-02-27 12:26:35 +09:00
Vincent Demeester 1f44fb6e15 Merge pull request #31349 from Phineas/master 
Update copyright dates
Upstream-commit: 60a94f7a04748490beaa3a2bad02734ad603b26c
Component: engine
 2017-02-26 16:06:39 +01:00
Vincent Demeester e0954908a7 Merge pull request #31351 from dnephin/what-are-even-build-args 
Refactor to remove duplicate code around BuildArgs
Upstream-commit: 24b4c9e7370222a9931678641b5ef7e66c2f6bc0
Component: engine
 2017-02-26 16:04:30 +01:00
Brian Goff c38e6f3b83 Merge pull request #31363 from genki/fixed_typo_in_formatter 
Fixed typo in service formatter.
Upstream-commit: 33ffb74d3c8a6c73747b042b7720cb5a6b29ff05
Component: engine
 2017-02-26 06:24:05 -05:00
Genki Takiuchi ee40a8603d Fixed typo. 
Signed-off-by: Genki Takiuchi <genki@s21g.com>
Upstream-commit: d654c3d83152a4bf879ddf04ae637d1e424453ee
Component: engine
 2017-02-26 12:59:18 +09:00
Daniel Nephin f19067fd22 Refactor to remove duplicate code around BuildArgs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6e005fd5ccd6ba90b51212c4a2539712b6398afd
Component: engine
 2017-02-24 16:22:32 -05:00
phineas 4dd2c604b6 Update copyright dates 
Signed-off-by: phineas <phin@phineas.io>
Upstream-commit: da8cf590eb56343f70d545c298a59d28f90eaf0f
Component: engine
 2017-02-24 19:41:59 +00:00
Alessandro Boch 958266ff9f Vendoring libnetwork @bdc9dce 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ff6a3bef5ab895bf87058f05b5e838afd8ba8393
Component: engine
 2017-02-24 11:08:53 -08:00
Aaron Lehmann ea150996ac Merge pull request #31192 from thaJeztah/warn-instead-of-error 
don't log v2 pull as error when retrying
Upstream-commit: 55fcd6f4db6088be90eef1e521e5e2e89d0b71a1
Component: engine
 2017-02-24 09:58:13 -08:00
Vincent Demeester 853294b2c3 Merge pull request #31330 from albers/completion-fix-node-plus-self 
Fix bash completion for `docker service ps --filter node`
Upstream-commit: 3470c8d7676ec7e16db2f2be32805c569ad9448e
Component: engine
 2017-02-24 15:35:27 +01:00
Vincent Demeester e5b24c69a8 Merge pull request #31329 from albers/completion-desired-state-shutdown 
Add completion for `--filter desired-state=shutdown`
Upstream-commit: d65a721f406297dc5ddd34cdf3a2a750fea99e15
Component: engine
 2017-02-24 15:33:52 +01:00
Vincent Demeester e930fd0d7a Merge pull request #31331 from albers/completion-node-ls--filter-missing 
Add bash completion for missing filters of `docker node ls`
Upstream-commit: a0993f6993a9f5e7be44108f5e1b6898a98b0a35
Component: engine
 2017-02-24 15:33:27 +01:00