toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,206 Commits 3 Branches 295 Tags
14d2d11c3d600b71b552760bb198f9d6c86b9a7c
Commit Graph
30206 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tõnis Tiigi 14d2d11c3d Merge pull request #30001 from runcom/fix-format 
devmapper: fixup error formatting
Upstream-commit: 45e88e995a3b48c7434e9338c3651a5168c630df
Component: engine
 2017-01-09 10:32:35 -08:00
Tibor Vass f34f548a3b Merge pull request #29955 from vieux/improve_secret_Create 
remove -f on secret create and unify usage with other commands
Upstream-commit: 3e298f46a2318c792dc476a178c3df34d1247fa4
Component: engine
 2017-01-09 10:22:39 -08:00
Sebastiaan van Stijn f2e905cf82 Merge pull request #29793 from thaJeztah/improve-run-usage-output 
Improve usage output for docker run
Upstream-commit: f199fadc7a713932fc827c63accbd67843d17691
Component: engine
 2017-01-09 18:15:25 +01:00
Sebastiaan van Stijn 701de0a381 Merge pull request #29226 from yongtang/28535-prune-until-follow-up 
Add `--filter until=<timestamp>` for `docker container/image prune`
Upstream-commit: f1fdbeca2a39c7189b1ca8db4e4543fe77ff1150
Component: engine
 2017-01-09 17:58:01 +01:00
Alexander Morozov 03f18af38a Merge pull request #29846 from thaJeztah/dont-create-init-path 
do not create init-dir if not needed
Upstream-commit: 9248351992fb0dacc490d4f83eb15085fb6a187e
Component: engine
 2017-01-09 08:47:51 -08:00
Alexander Morozov c41fd16fe5 Merge pull request #29996 from thaJeztah/unfork-go-memdb 
un-fork go-memdb
Upstream-commit: edcfb83b836e8fbee225988b601bc9e45ab30028
Component: engine
 2017-01-09 08:01:06 -08:00
Antonio Murdaca 15e349bb0f devmapper: fixup error formatting 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8bcbc6711ffa253968c30ebf1366e79dfd08e205
Component: engine
 2017-01-09 16:58:09 +01:00
Vincent Demeester f847e17cf2 Merge pull request #30000 from ralphtheninja/master 
Attempts -> MaxAttempts in /services/create
Upstream-commit: 4166801f606b54987fb9a3fda447fc71d3cd0c28
Component: engine
 2017-01-09 16:48:56 +01:00
Lars-Magnus Skog a688a9fc84 Attempts -> MaxAttempts in /services/create 
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net>
Upstream-commit: 778eeaea2089eed1f0f113bdc73f427b4e68c572
Component: engine
 2017-01-09 16:04:34 +01:00
Sebastiaan van Stijn 9163877f8e do not create init-dir if not needed 
commit 56f77d5ade945b3b8816a6c8acb328b7c6dce9a7
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>
Upstream-commit: f285d5b3e8eeea7d85e143d845e85a4d4e4c936a
Component: engine
 2017-01-09 15:28:51 +01:00
Brian Goff 31fc922f11 Merge pull request #29688 from tronicum/since-flag 
explain since format and give examples
Upstream-commit: d0053a34bc979a49e6a9c11b8b5e0d25f43ea3ec
Component: engine
 2017-01-09 09:27:30 -05:00
Sebastiaan van Stijn 4e4ffe7a26 un-fork go-memdb 
commit 9322636c8926f155a10d9679e364e3f8e86203d6
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>
Upstream-commit: 5f057f6350364d93b5e32ad205a492f399ce1cd3
Component: engine
 2017-01-09 15:05:49 +01:00
Sebastiaan van Stijn 3bc19fbcc4 Merge pull request #29795 from vdemeester/integration-request-package 
[test-integration] Add a new request package in integration-cli
Upstream-commit: d4791c7b64b6095917e0a0ac9b376045ef3d353f
Component: engine
 2017-01-09 14:51:40 +01:00
Vincent Demeester a4186cae43 Merge pull request #29874 from allencloud/fix-29872-volume-ls-filter 
fix volume ls filter driver
Upstream-commit: e8e4546bc34ae3b84a9cbdd089f972f56695ece5
Component: engine
 2017-01-09 13:06:17 +01:00
Sebastiaan van Stijn 7d491b0c56 Merge pull request #29989 from yuexiao-wang/fix-url-alias 
Fix incorrect alias and URL
Upstream-commit: 03d28f75b878e277073a4db235af3381d3697eec
Component: engine
 2017-01-09 11:59:56 +01:00
yuexiao-wang afa2fae81f Fix incorrect alias and URL 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9c0b3e1650ffe6f85376e1399a304204539d2495
Component: engine
 2017-01-09 20:14:48 +08:00
Sebastiaan van Stijn 464b599165 Merge pull request #29985 from lixiaobing10051267/masterEvnfile 
fix some typos in runconfig\opts\envfile_test.go
Upstream-commit: 141e1b3eb6425057b5b302b9002590e104b7f660
Component: engine
 2017-01-09 11:43:31 +01:00
Vincent Demeester a1623b99ae Merge pull request #29931 from tonistiigi/test-swarm-errors 
Add test for swarm error handling
Upstream-commit: f96180a0a88c541b1a413a9371cb5695c70b7323
Component: engine
 2017-01-09 11:26:09 +01:00
lixiaobing10051267 cd5b952e17 fix some typos in runconfig\opts\envfile_test.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 58da4c1bab83988486d31ad497a68abd77f05316
Component: engine
 2017-01-09 11:14:18 +08:00
Doug Davis bbb9a20ab0 Merge pull request #29981 from allencloud/fix-nits-in-comments 
fix nit in comments
Upstream-commit: b532e15036132cc1dae44989e1f9f1cf01f139ff
Component: engine
 2017-01-08 09:34:43 -05:00
allencloud aa92b07a0f fix nit in comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 847de59934bd1f9134b235ce70a5c2e1085a470e
Component: engine
 2017-01-08 21:32:30 +08:00
ttronicum 7f19873a05 explain since format and give examples 
Signed-off-by: tronicum <tronicum@user.github.com>
Upstream-commit: 519c35889ebe6b232fa1181709e3464c22fb516a
Component: engine
 2017-01-08 05:27:54 +01:00
Aaron Lehmann dcda437eae Merge pull request #29963 from stevvooe/use-digest-package 
*: use opencontainers/go-digest package
Upstream-commit: 7c62f58b27f98140ff3d39de166bf2e107e84a65
Component: engine
 2017-01-07 09:22:50 -08:00
Stephen J Day 5932f8db18 vendor: update dependencies for go-digest 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 083ad52f607e83b41e508827c8d502448f606a09
Component: engine
 2017-01-06 18:48:52 -08:00
Stephen J Day 775c5633ef *: 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>
Upstream-commit: 7a855799175b6b984886ef1cfa337d6df1d4c668
Component: engine
 2017-01-06 18:48:41 -08:00
Tibor Vass 096ec96e89 Merge pull request #29917 from rhvgoyal/output-device-id 
devmapper: Return device id in error message
Upstream-commit: c43bac064ba634f04145ff94083137d2b24545e1
Component: engine
 2017-01-06 17:36:18 -08:00
Alexander Morozov 042842caf4 Merge pull request #29927 from aaronlehmann/vendor-swarmkit-2e956c4 
Revendor swarmkit to 2e956c4
Upstream-commit: fad6db4465d6c30f380e3d6638377ced1202116c
Component: engine
 2017-01-06 17:09:21 -08:00
Doug Davis aa762aa524 Merge pull request #29956 from tonistiigi/fix-workdir-cache 
Fix workdir cache invalidation
Upstream-commit: ce814b20197003aaed24136c508c381d445152cb
Component: engine
 2017-01-06 19:40:53 -05:00
Victor Vieux 589e081a09 remove -f on secret create and unify usage with other commands 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: db6652ca71c60c1ff3ac274968876c88eb7146ad
Component: engine
 2017-01-06 14:07:48 -08:00
Tibor Vass 4cc05c4d0d Merge pull request #29949 from albers/fix-changelog-create-service 
Fix wrong command in changelog
Upstream-commit: 6d77c02240c43b79ed518ad9ef92466aa84b2b4a
Component: engine
 2017-01-06 13:30:00 -08:00
Tonis Tiigi 236f68013a Fix workdir cache invalidation 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e16086005425b626bccc0fedcf5ae195f913c636
Component: engine
 2017-01-06 12:10:59 -08:00
Akihiro Suda f491f5cc6c Merge pull request #29893 from cpuguy83/fix_race_in_plugin_activation 
Fix race accessing plugin storage map
Upstream-commit: 2e3a62152373af5d7238a375785cfdf39b413919
Component: engine
 2017-01-07 04:48:41 +09:00
Vincent Demeester a6a7d0048a Merge pull request #29741 from yuexiao-wang/update-option 
keep network options consistent between network connect and run
Upstream-commit: ee9bb347a678640a5305314eca99870971c1fc65
Component: engine
 2017-01-06 19:01:48 +01:00
Sebastiaan van Stijn 5c69746852 Merge pull request #29841 from wefine/docker_image_tag_input_check 
check both source_image_tag and target_image_tag for 'docker image tag'
Upstream-commit: fc9d74136bf22f9a1d0a7d69bfeae33055d360ad
Component: engine
 2017-01-06 17:58:58 +01:00
wefine 06b5f5c249 check both source_image_tag and target_image_tag for 'docker image tag' 
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
Upstream-commit: a041697cabb934e875a1e7f8adea15495209b347
Component: engine
 2017-01-07 04:55:53 +08:00
Sebastiaan van Stijn 1725c8a9d3 Merge pull request #29899 from Microsoft/jjh/testbuildworkdirimagecmd 
Windows: Enable TestBuildWorkdirImageCmd
Upstream-commit: b7c25317799e5fa380d3167823f09263f4397114
Component: engine
 2017-01-06 17:15:22 +01:00
Harald Albers 6e6e9806d5 Fix wrong command in changelog 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1fe0270e728dd587c724c5f0de211ab739918e4b
Component: engine
 2017-01-06 07:45:09 -08:00
Sebastiaan van Stijn d5e0782250 Merge pull request #29934 from lixiaobing10051267/masterTop 
Provide correct command information and URL
Upstream-commit: ec215d48603706ceaa62d5bfd16fee902168d087
Component: engine
 2017-01-06 15:02:34 +01:00
Sebastiaan van Stijn 2f07f645eb Merge pull request #29935 from yuexiao-wang/fix-return 
Remove redundant return nil
Upstream-commit: 1df474a3118907a072ff5ac7a60529f0846a770e
Component: engine
 2017-01-06 13:59:44 +01:00
yuexiao-wang 434810fce9 Remove redundant return nil 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9788822421255a0516a0e3ce2ac32b1ec9d7d894
Component: engine
 2017-01-06 22:18:10 +08:00
Akihiro Suda 72dca92b14 Merge pull request #29929 from aaronlehmann/secret-test-fix 
Fix TestSecretCreateWithLabels nondeterminism
Upstream-commit: bf8cdb9172c3516eecb80974971b0b2da00afc11
Component: engine
 2017-01-06 13:47:08 +09:00
Brian Goff bd5280d393 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>
Upstream-commit: 21fcbb39b73310e69d6403a1cfa8b26799cc1355
Component: engine
 2017-01-05 22:40:45 -05:00
lixiaobing10051267 97d6813cf8 Provide correct command imformation and URL 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: d8e6241989cdfda4513dd30faef00f1f71afa489
Component: engine
 2017-01-06 11:02:02 +08:00
Brian Goff 47410763de Merge pull request #29923 from tonistiigi/plugin-names 
Set plugins used in tests back to original names
Upstream-commit: 9c3955aae1bf5f743523abc7d310b0a6668ee062
Component: engine
 2017-01-05 21:41:39 -05:00
Sebastiaan van Stijn f61ba34e6f Merge pull request #29924 from aaronlehmann/logrus-vendor 
vendor: Unfork logrus dependency
Upstream-commit: 5259d7639347e50e1a63eb64570cae71cb9a37c3
Component: engine
 2017-01-06 02:10:22 +01:00
Tonis Tiigi 2eb5499d33 Add test for swarm error handling 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d377b074fdcbf735d9fbafdb9bcab6878e5c0ae9
Component: engine
 2017-01-05 15:46:07 -08:00
Aaron Lehmann 0317f61145 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>
Upstream-commit: 45833ce54d741b2378819e3ba5859533c317ae01
Component: engine
 2017-01-05 15:22:51 -08:00
Aaron Lehmann 5b11368767 Revendor swarmkit to 2e956c4 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: b1f5320dd6812a34cb4684419f509d17798985b7
Component: engine
 2017-01-05 14:55:52 -08:00
Victor Vieux 773b47f51e Merge pull request #29920 from jeveleth/patch-1 
Fixes minor typo
Upstream-commit: 1b2786c2c21d0e432b769446c02beed99550b57d
Component: engine
 2017-01-05 14:37:00 -08:00
Aaron Lehmann d3ac4a81ef 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>
Upstream-commit: 11df2db538fbc7a6181c591b6ec47db9f96a87e4
Component: engine
 2017-01-05 14:19:08 -08:00