dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-10 17:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,480 Commits 19 Branches 592 Tags
40b8ff62431d2005e5801b88dbe1685e89baafe5
Commit Graph

4158 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
457d562af1 Merge pull request #28917 from erxian/correct-secret-remove-http-return-code 
correct the http return code of secret remove
 2016-11-30 22:47:28 +01:00
Alexander Morozov
53d69aeb74 Merge pull request #28885 from vdemeester/revert-service-ps-all 
Revert "Add -a option to service/node ps"
 2016-11-30 12:02:34 -08:00
Alexander Morozov
caaa52c124 Merge pull request #28838 from AkihiroSuda/remove-run-mount 
[Revert #26825] cli: remove `--mount` from `docker run`
 2016-11-30 11:56:42 -08:00
Doug Davis
4a0e295cd1 Merge pull request #28725 from Microsoft/jjh/builderenvcaseinsensitive 
Windows: Builder case insensitive env
 2016-11-30 08:33:29 -05:00
erxian
21768933fb correct the http return code of secret remove 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-11-30 19:45:45 +08:00
Tõnis Tiigi
1b6352996a Merge pull request #28566 from cyli/more-swarm-encryption-tests 
Add extra swarm lock/unlock tests that ensure that all the managers are locked with the same key
 2016-11-29 18:32:32 -08:00
Dong Chen
e42d1bb4b2 Run overlay attachable test on a single daemon 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-11-29 14:05:12 -08:00
Madhu Venugopal
4fae94f663 Merge pull request #28721 from dongluochen/attachable_network 
Fix network attachable option
 2016-11-29 11:04:49 -08:00
Anusha Ragunathan
82b35dd997 Merge pull request #28717 from yongtang/28684-duplicate-docker-plugin-create 
Fix issue caused by duplicate `docker plugin create` with same names
 2016-11-29 08:22:40 -08:00
Dong Chen
abcb699ad1 Fix network attachable option. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-11-28 16:54:56 -08:00
Josh Hawn
eeac871946 Reject unspecified advertise addr on swarm init 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2016-11-28 15:44:06 -08:00
Yong Tang
662d456928 Fix issue caused by duplicate docker plugin create with same names 
This fix tries to fix the issue raised in 28684:
1. Duplicate plugin create with the same name will override the old plugin reference
2. In case an error happens in the middle of the plugin creation, plugin directories
   in `/var/lib/docker/plugins` are not cleaned up.

This fix update the plugin store so that `Add()` will return an error if a plugin
with the same name already exist.

This fix also will clean up the directory in `/var/lib/docker/plugins` in case
an error happens in the middle of the plugin creation.

This fix fixes 28684.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-28 12:37:49 -08:00
John Howard
dfeaf7a959 Align output of docker version again 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 11:38:58 -08:00
John Howard
49f392ff6b Windows: Builder case insensitive env 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 10:30:45 -08:00
Doug Davis
937027a0cb Merge pull request #28514 from Microsoft/jjh/workdir 
Refix COPY file . after WORKDIR (now always created)
 2016-11-28 12:58:17 -05:00
Vincent Demeester
eb55d03f3c Revert "Add -a option to service/node ps" 
This reverts commit 139fff2bf0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 18:08:45 +01:00
Antonio Murdaca
76a0dfaa8e Merge pull request #28710 from miaoyq/eliminate-redundant-parameters 
Eliminate the redundant parameter
 2016-11-26 14:37:17 +01:00
Akihiro Suda
e6d9b7de64 cli: remove --mount from docker run 
This commit reverts 273eeb813c (#26825).
For the discussion so far, please refer to #28527.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-11-26 04:55:28 +00:00
John Howard
38faf6e043 Windows: Update TP5 refs in run_test.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-23 14:28:06 -08:00
John Howard
286ab6d69b COPY file . after WORKDIR (now always created) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-23 09:56:02 -08:00
Vincent Demeester
eb5fe064cf Fixes some integration-cli on userns 
Mainly adding requirements on Network or NotUserNamespace to make it pass.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-23 14:03:53 +01:00
cyli
be2603973d Add some swarm encryption tests, and modify some existing ones, to test locking the whole cluster 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 20:56:45 -05:00
Victor Vieux
7c6f001248 Merge pull request #28716 from ehazlett/fix-multi-secret-inspect 
Update secret inspect to support IDs
 2016-11-22 17:39:48 -08:00
Yanqiang Miao
58028a2919 Eliminate redundant parameters 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-23 09:28:13 +08:00
Tõnis Tiigi
5c1826ec4d Merge pull request #28683 from darrenstahlmsft/SystemDLL 
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
 2016-11-22 16:58:30 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes 
Plugin miscellaneous fixes
 2016-11-22 16:12:37 -08:00
Darren Stahl
22c83c567f Swap usage of LazyDLL and LoadDLL to LazySystemDLL. 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-22 14:57:11 -08:00
Sebastiaan van Stijn
0415525049 Merge pull request #26833 from cpuguy83/use_mounts_api_for_services 
Use container Mounts API for Swarm containers.
 2016-11-22 22:48:54 +01:00
Victor Vieux
c025d56504 Merge pull request #28691 from aluzzardi/service-logs-no-follow 
[experimental] service logs: Support no-follow mode
 2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn
313502488e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs 
Prepare docs and Swagger definition for automatically generated API docs
 2016-11-22 22:47:38 +01:00
Evan Hazlett
70d2cefd51 update secret inspect to support IDs 
This updates secret inspect to support inspect by ID in addition to name
as well as inspecting multiple secrets.  This also cleans up the
help text for consistency.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-22 16:01:16 -05:00
Brian Goff
39e2e07567 Merge pull request #28668 from anusha-ragunathan/fix_teardown 
Check for valid daemon in TearDownTest.
 2016-11-22 13:26:08 -05:00
Brian Goff
821aeb6a6f Use container Mounts API for Swarm containers. 
Instead of converting nicely typed service mounts into untyped `Binds`
when creating containers, use the new `Mounts` API which is a 1-1
mapping between service mounts and container mounts.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-22 13:23:51 -05:00
Victor Vieux
772a423e08 Merge pull request #28529 from allencloud/update-secret-create-url 
fix secret create url for consistency
 2016-11-22 09:55:17 -08:00
Ben Firshman
f0d55cd081 Rename Remote API to Engine API 
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Andrea Luzzardi
c2d435e4f0 service logs: Support no-follow mode 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-21 18:02:13 -08:00
Tonis Tiigi
4e262f6387 Fix race on sending stdin close event 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-21 17:43:01 -08:00
Tibor Vass
a08ffa0e93 plugins: fix some tests 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-11-21 16:34:10 -08:00
Anusha Ragunathan
5890091cc0 Check for valid daemon in TearDownTest. 
SetupTest could fail creating a Daemon object (eg, out of space when
creating daemon root dir). In such a case, TearDownTest fails when
accessing the daemon object. This commit adds the required nil check.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-21 13:29:13 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
 2016-11-21 21:40:01 +01:00
Tom Denham
5d983d21bf Update tests to handle bug fix from libnetwork 
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2016-11-19 16:34:56 -08:00
Victor Vieux
9c559e6d0b fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 18:32:02 -08:00
Justin Cormack
b4e69fb3aa Merge pull request #28580 from allencloud/fix-nits-in-error-message 
fix typos
 2016-11-18 13:18:23 +00:00
Michael Crosby
aff99136b4 Fix cfs period calculation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-11-18 00:47:43 -08:00
allencloud
1f039a66ac fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 15:51:36 +08:00
allencloud
86d7682843 update secret create url for consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 10:18:21 +08:00
Michael Crosby
4b29f404b1 Merge pull request #28458 from yongtang/28456-cpus-error-message 
Fix error messages for `--cpus` from daemon
 2016-11-17 16:29:21 -08:00
Evan Hazlett
bebd472e40 do not force target type for secret references 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use secret store interface instead of embedded secret data into container

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-17 15:49:02 -05:00
Aaron Lehmann
6d0f7bb4c7 Merge pull request #28523 from yongtang/28519-service-inspect-pretty-crash 
Fix crash caused by `docker service inspect --pretty`
 2016-11-17 10:56:57 -08:00
Alexander Morozov
0a5a41a438 Merge pull request #28415 from Microsoft/jjh/builduser 
Windows: Allow `USER` in builder
 2016-11-17 10:32:56 -08:00