docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
30,230 Commits 12 Branches 297 Tags
2f215f3de25807d8a21f3db03cb2517346473513
Commit Graph

28444 Commits

Author SHA1 Message Date
Michael Crosby
2f215f3de2 Merge pull request #29967 from justincormack/gpg-include-keys 
Do not use keyservers to fetch GPG keys for apt
Upstream-commit: 518945b6bd30dc535addf2aac9d5eeefbfc5e523
Component: engine
 2017-01-10 11:35:11 -08:00
Vincent Demeester
59c79fe38f Merge pull request #29787 from yongtang/29730-multiple-published-port 
Fix issues of multiple published ports mapping to the same target port
Upstream-commit: 82dfa6563fe78d41eb2f720e1f041f52e02b2a7a
Component: engine
 2017-01-10 18:49:16 +01:00
Sebastiaan van Stijn
bc04d9530c Merge pull request #30021 from vdemeester/29994-followup 
Few stack deploy network fixes
Upstream-commit: 2209c9c948331bac0f706cb0e068ae3bb134d55c
Component: engine
 2017-01-10 16:40:51 +01:00
Sebastiaan van Stijn
6a39de5e4f Merge pull request #29947 from vdemeester/integration-some-runCommandWithOutput-clean 
[test-integration] clean some runCommandWithOutput
Upstream-commit: e5058ff15cac51836f426175df8a7840a670f046
Component: engine
 2017-01-10 15:56:42 +01:00
Yong Tang
5bf9b5443d Update swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857 
This commit updates swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f3a274fa08d70e25b31ba0e0603d14d3b9997c32
Component: engine
 2017-01-10 03:46:42 -08:00
Vincent Demeester
c1d7d93cb3 Few stack deploy network fixes 
- Make sure we use the correct network name for external ones.
- Make the default network overridable and only creates networks that
  are used by services — so that default network is only created if a
  service doesn't declare a network.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3191f5809bc1233bbf2103d2432b75cac93567bb
Component: engine
 2017-01-10 10:29:09 +01:00
Yong Tang
3229d5a2cb Fix issues of multiple published ports mapping to the same target port 
This fix tries to address the issue raised in docker/docker-29730
where a service with multiple published ports mapping to the same target
port (e.g., `--publish 5000:80 --publish 5001:80`) can't be allocated.

The reason for the issue is that, `getPortConfigKey` is used for both
allocated ports and configured (may or may not be allocated) ports.
However, `getPortConfigKey` will not take into consideration the
`PublishedPort` field, which actually could be different for different
allocated ports.

This fix saves a map of `portKey:portNum:portState`,  instead of currently
used `portKey:portState` so that multiple published ports could be processed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cb59bd0c5194f3f74cd405a87b562465219cad8a
Component: engine
 2017-01-10 00:46:18 -08:00
Vincent Demeester
b3e47ec408 Merge pull request #29564 from aaronlehmann/getter-types 
plugingetter: Avoid all caps for constant declarations
Upstream-commit: 9c96768eae4b3a65147b47a55c850c103ab8972d
Component: engine
 2017-01-10 09:35:19 +01:00
Sebastiaan van Stijn
1f4bebfb09 Merge pull request #30005 from dnephin/fix-stack-deploy-resources 
Fix parsing resources from compose file for stack deploy.
Upstream-commit: 8563492eefb1653c7e83b539a254446a555961e3
Component: engine
 2017-01-09 22:50:01 +01:00
Vincent Demeester
96ecd9523f Merge pull request #30002 from Microsoft/jjh/registerdiffids 
Windows: Remove dead code RegisterDiffIDs
Upstream-commit: c0e679660f26e1e3b90904365dd253613e7bccba
Component: engine
 2017-01-09 22:43:54 +01:00
Vincent Demeester
acc7a7c5ca Merge pull request #29918 from dongluochen/service_inspect_pretty 
add port PublishMode to service inspect --pretty output
Upstream-commit: d6c8391bf680b1f7995e0390a346f10b114d1990
Component: engine
 2017-01-09 22:43:41 +01:00
Sebastiaan van Stijn
a164ad0f0e Merge pull request #29802 from thaJeztah/fix-secret-rm-consistency 
Update order of '--secret-rm' and '--secret-add'
Upstream-commit: cd82a31edbae37c31212ac8b23180d90735ceab4
Component: engine
 2017-01-09 21:34:05 +01:00
Sebastiaan van Stijn
ddcbfb5519 Merge pull request #29143 from vdemeester/node-cli-unit-tests 
Add some unit tests to the node and swarm cli code
Upstream-commit: 38f766ae0e4b80d452a3825c42a7ac9fee965790
Component: engine
 2017-01-09 20:52:23 +01:00
Vincent Demeester
4184bed437 Merge pull request #29953 from williammartin/truncindex-iterate-lock 
Fix non thread-safe Iteration around go-patricia
Upstream-commit: fe9f5610c49b1a6ca2ebbb68c1478fc7f106eaa8
Component: engine
 2017-01-09 20:23:35 +01:00
Daniel Nephin
6300d8ca1e Fix parsing resources from compose file for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e3f083530f27bc57fceab684fb3182b79a960e79
Component: engine
 2017-01-09 14:22:02 -05:00
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
Dong Chen
ccb8041876 add port PublishMode to service inspect --pretty output 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 5470312d236445b54bb6723f47c0966d3b057658
Component: engine
 2017-01-09 10:30:28 -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
Vincent Demeester
f6ad06ceb6 Add some unit tests to the node and swarm cli code 
Start work on adding unit tests to our cli code in order to have to
write less costly integration test.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f151c297eb268e22dc1eb36ded0e356885f40739
Component: engine
 2017-01-09 18:30:15 +01: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
William Martin
782c3f08db Fix non thread-safe Iteration around go-patricia 
* Unlike other methods in truncindex, Iterate was not locking before
using the Trie, making it potentially race e.g. Delete could result in
setting a child to nil, while Iterate dereferenced that node
while walking the Trie.

Signed-off-by: Petar Petrov <pppepito86@gmail.com>
Upstream-commit: 57dada53382106952d287dd1f16773e08213ae8d
Component: engine
 2017-01-09 17:06:50 +00: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
John Howard
2401da5f36 Windows: Remove dead code RegisterDiffIDs 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 02ed83aee95e506ace3a994bb2ebb7e94df5a438
Component: engine
 2017-01-09 08:56:34 -08: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
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
Vincent Demeester
78d1ff88be Update trustedCmd to be compatible with testutil/cmd 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 303b1d200af65ebb165602d0137f8b24b7c54d66
Component: engine
 2017-01-09 11:07:05 +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
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
Justin Cormack
f716752c81 Do not use keyservers to fetch GPG keys for apt 
The keyserver infrastructure is unreliable, and just adds another point
of failure without adding any security. Instead, commit the key used at
build time for ZFS to the repo, and inline our signing key into the
install script rather than just its fingerprint.

fix #28510
fix #13555

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 91b42cf8428ec20c3d6775019ed04d89330c1dcd
Component: engine
 2017-01-07 12:06:52 +00: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