beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
30206 commits 14 branches 412 tags 338 MiB
Commit graph

30206 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tõnis Tiigi
45e88e995a Merge pull request #30001 from runcom/fix-format 
devmapper: fixup error formatting
 2017-01-09 10:32:35 -08:00
Tibor Vass
3e298f46a2 Merge pull request #29955 from vieux/improve_secret_Create 
remove -f on secret create and unify usage with other commands
 2017-01-09 10:22:39 -08:00
Sebastiaan van Stijn
f199fadc7a Merge pull request #29793 from thaJeztah/improve-run-usage-output 
Improve usage output for docker run
 2017-01-09 18:15:25 +01:00
Sebastiaan van Stijn
f1fdbeca2a Merge pull request #29226 from yongtang/28535-prune-until-follow-up 
Add `--filter until=<timestamp>` for `docker container/image prune`
 2017-01-09 17:58:01 +01:00
Alexander Morozov
9248351992 Merge pull request #29846 from thaJeztah/dont-create-init-path 
do not create init-dir if not needed
 2017-01-09 08:47:51 -08:00
Alexander Morozov
edcfb83b83 Merge pull request #29996 from thaJeztah/unfork-go-memdb 
un-fork go-memdb
 2017-01-09 08:01:06 -08:00
Antonio Murdaca
8bcbc6711f
devmapper: fixup error formatting 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-01-09 16:58:09 +01:00
Vincent Demeester
4166801f60 Merge pull request #30000 from ralphtheninja/master 
Attempts -> MaxAttempts in /services/create
 2017-01-09 16:48:56 +01:00
Lars-Magnus Skog
778eeaea20 Attempts -> MaxAttempts in /services/create 
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net>
 2017-01-09 16:04:34 +01:00
Sebastiaan van Stijn
f285d5b3e8
do not create init-dir if not needed 
commit 56f77d5ade
added support for cpu-rt-period and cpu-rt-runtime,
but always initialized the cgroup path, even if not
used.

As a result, containers failed to start on a
read-only filesystem.

This patch only creates the cgroup path if
one of these options is set.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-01-09 15:28:51 +01:00
Brian Goff
d0053a34bc Merge pull request #29688 from tronicum/since-flag 
explain since format and give examples
 2017-01-09 09:27:30 -05:00
Sebastiaan van Stijn
5f057f6350
un-fork go-memdb 
commit 9322636c89
temporarily switched to a fork of go-memdb, because
a pull request that was needed was not yet merged
upstream.

this pull request was merged, so we can un-fork
this dependency.

this change does not bump the dependency, and
only un-forks. bumping the dependency should
be done in a separate change, if needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-01-09 15:05:49 +01:00
Sebastiaan van Stijn
d4791c7b64 Merge pull request #29795 from vdemeester/integration-request-package 
[test-integration] Add a new request package in integration-cli
 2017-01-09 14:51:40 +01:00
Vincent Demeester
e8e4546bc3 Merge pull request #29874 from allencloud/fix-29872-volume-ls-filter 
fix volume ls filter driver
 2017-01-09 13:06:17 +01:00
Sebastiaan van Stijn
03d28f75b8 Merge pull request #29989 from yuexiao-wang/fix-url-alias 
Fix incorrect alias and URL
 2017-01-09 11:59:56 +01:00
yuexiao-wang
9c0b3e1650 Fix incorrect alias and URL 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-01-09 20:14:48 +08:00
Sebastiaan van Stijn
141e1b3eb6 Merge pull request #29985 from lixiaobing10051267/masterEvnfile 
fix some typos in runconfig\opts\envfile_test.go
 2017-01-09 11:43:31 +01:00
Vincent Demeester
f96180a0a8 Merge pull request #29931 from tonistiigi/test-swarm-errors 
Add test for swarm error handling
 2017-01-09 11:26:09 +01:00
lixiaobing10051267
58da4c1bab fix some typos in runconfig\opts\envfile_test.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2017-01-09 11:14:18 +08:00
Doug Davis
b532e15036 Merge pull request #29981 from allencloud/fix-nits-in-comments 
fix nit in comments
 2017-01-08 09:34:43 -05:00
allencloud
847de59934 fix nit in comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-01-08 21:32:30 +08:00
ttronicum
519c35889e explain since format and give examples 
Signed-off-by: tronicum <tronicum@user.github.com>
 2017-01-08 05:27:54 +01:00
Aaron Lehmann
7c62f58b27 Merge pull request #29963 from stevvooe/use-digest-package 
*: use opencontainers/go-digest package
 2017-01-07 09:22:50 -08:00
Stephen J Day
083ad52f60
vendor: update dependencies for go-digest 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-01-06 18:48:52 -08:00
Stephen J Day
7a85579917
*: use opencontainers/go-digest package 
The `digest` data type, used throughout docker for image verification
and identity, has been broken out into `opencontainers/go-digest`. This
PR updates the dependencies and moves uses over to the new type.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-01-06 18:48:41 -08:00
Tibor Vass
c43bac064b Merge pull request #29917 from rhvgoyal/output-device-id 
devmapper: Return device id in error message
 2017-01-06 17:36:18 -08:00
Alexander Morozov
fad6db4465 Merge pull request #29927 from aaronlehmann/vendor-swarmkit-2e956c4 
Revendor swarmkit to 2e956c4
 2017-01-06 17:09:21 -08:00
Doug Davis
ce814b2019 Merge pull request #29956 from tonistiigi/fix-workdir-cache 
Fix workdir cache invalidation
 2017-01-06 19:40:53 -05:00
Victor Vieux
db6652ca71 remove -f on secret create and unify usage with other commands 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-06 14:07:48 -08:00
Tibor Vass
6d77c02240 Merge pull request #29949 from albers/fix-changelog-create-service 
Fix wrong command in changelog
 2017-01-06 13:30:00 -08:00
Tonis Tiigi
e160860054 Fix workdir cache invalidation 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-06 12:10:59 -08:00
Akihiro Suda
2e3a621523 Merge pull request #29893 from cpuguy83/fix_race_in_plugin_activation 
Fix race accessing plugin storage map
 2017-01-07 04:48:41 +09:00
Vincent Demeester
ee9bb347a6 Merge pull request #29741 from yuexiao-wang/update-option 
keep network options consistent between network connect and run
 2017-01-06 19:01:48 +01:00
Sebastiaan van Stijn
fc9d74136b Merge pull request #29841 from wefine/docker_image_tag_input_check 
check both source_image_tag and target_image_tag for 'docker image tag'
 2017-01-06 17:58:58 +01:00
wefine
a041697cab check both source_image_tag and target_image_tag for 'docker image tag' 
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
 2017-01-07 04:55:53 +08:00
Sebastiaan van Stijn
b7c2531779 Merge pull request #29899 from Microsoft/jjh/testbuildworkdirimagecmd 
Windows: Enable TestBuildWorkdirImageCmd
 2017-01-06 17:15:22 +01:00
Harald Albers
1fe0270e72 Fix wrong command in changelog 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-01-06 07:45:09 -08:00
Sebastiaan van Stijn
ec215d4860 Merge pull request #29934 from lixiaobing10051267/masterTop 
Provide correct command information and URL
 2017-01-06 15:02:34 +01:00
Sebastiaan van Stijn
1df474a311 Merge pull request #29935 from yuexiao-wang/fix-return 
Remove redundant return nil
 2017-01-06 13:59:44 +01:00
yuexiao-wang
9788822421 Remove redundant return nil 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-01-06 22:18:10 +08:00
Akihiro Suda
bf8cdb9172 Merge pull request #29929 from aaronlehmann/secret-test-fix 
Fix TestSecretCreateWithLabels nondeterminism
 2017-01-06 13:47:08 +09:00
Brian Goff
21fcbb39b7 Fix race accessing plugin storage map 
`plugins.GetAll()` was not locking the plugin map when checking if a
plugin exists, this can cause a race and potentially a panic if another
goroutine is trying to load a plugin into the map at the same time.

Also fixes a race during activation where a plugin inserts itself into
the plugin map but does not check if something else is already there.
This is already checked before trying to activate the plugin, however
the map lock is not held for this entire period, so other plugins may be
loaded during this time.
To fix, before inserting the plugin into the map, check if one with the
same name already exists and use that instead.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-01-05 22:40:45 -05:00
lixiaobing10051267
d8e6241989 Provide correct command imformation and URL 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2017-01-06 11:02:02 +08:00
Brian Goff
9c3955aae1 Merge pull request #29923 from tonistiigi/plugin-names 
Set plugins used in tests back to original names
 2017-01-05 21:41:39 -05:00
Sebastiaan van Stijn
5259d76393 Merge pull request #29924 from aaronlehmann/logrus-vendor 
vendor: Unfork logrus dependency
 2017-01-06 02:10:22 +01:00
Tonis Tiigi
d377b074fd Add test for swarm error handling 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-05 15:46:07 -08:00
Aaron Lehmann
45833ce54d Fix TestSecretCreateWithLabels nondeterminism 
This test checks for the substring "foo" in the "secret ls" output. This
is a valid base36 substring and can sometimes show up by chance:

    docker_cli_secret_create_test.go:86:
        c.Assert(out, checker.Not(checker.Contains), name)
    ... obtained string = "" +
    ...     "ID                          NAME                        CREATED UPDATED\n" +
    ...     "ob8y4t4feuz8pn5h6vla9oxoz   stefoo7e268ozqfupi9s4se9q   Less than a second ago   Less than a second ago\n"
    ... substring string = "foo"

Change the secret name to test_secret, matching other tests. Underscores
can't appear in base36 so this name is safe to grep for.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-05 15:22:51 -08:00
Aaron Lehmann
b1f5320dd6 Revendor swarmkit to 2e956c4 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-05 14:55:52 -08:00
Victor Vieux
1b2786c2c2 Merge pull request #29920 from jeveleth/patch-1 
Fixes minor typo
 2017-01-05 14:37:00 -08:00
Aaron Lehmann
11df2db538 vendor: Unfork logrus dependency 
Vendor the latest official logrus release instead of a custom fork
(which now happens to be identical to the fork).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-05 14:19:08 -08:00