toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,536 Commits 3 Branches 295 Tags
c0aa09b7601a377e9ee5b4c188b7d44df518573a
Commit Graph
29536 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff c0aa09b760 Merge pull request #28988 from vdemeester/28985-dont-validate-hostname 
Remove hostname validation as it seems to break users
Upstream-commit: 3cb310c21049f652dd00d20899cb1ece1ee9aa8f
Component: engine
 2016-12-02 21:16:56 -05:00
Sebastiaan van Stijn 30839117e7 Merge pull request #28735 from yongtang/28708-plugin-list-id 
Add `ID` field for `docker plugin ls`
Upstream-commit: 51c5718aa357d3319f579caa39d313e4d55ff794
Component: engine
 2016-12-03 02:37:09 +01:00
Tibor Vass cc93b75a69 Merge pull request #29064 from vdemeester/29005-revert-builder-comments-line 
Revert "Fix dockerfile parser with empty line after escape"
Upstream-commit: 6dff86f8b342c92e7686673fece7f31adf1bf836
Component: engine
 2016-12-02 17:11:18 -08:00
Sebastiaan van Stijn 095013e19b Merge pull request #28349 from allencloud/add-missing-code-in-api-docs 
add missing status code of swarm cluster in api 1.24
Upstream-commit: 535db46be508d38a6f9f304a4e57e0c3d1c94af1
Component: engine
 2016-12-03 02:04:05 +01:00
Victor Vieux 6be6989ae5 Merge pull request #28994 from cpuguy83/allow_vol_recreate_for_same_driver 
Fix out-of-band vol delete+create for same driver
Upstream-commit: 42aafe725ff20c6a97f7e4e06b3ec5ee9e615fb3
Component: engine
 2016-12-02 15:12:13 -08:00
Arnaud Porterie 961c833b2d Merge pull request #29090 from vieux/update_poule_config 
update poule.yml
Upstream-commit: 07489b8e79158f9d6dddbcb04cba87ff414f3d4b
Component: engine
 2016-12-02 15:06:26 -08:00
Sebastiaan van Stijn 40bdf9e61c Merge pull request #28964 from Microsoft/jjh/make 
Windows: make.ps1 and dockerfile for native builds
Upstream-commit: ab56641ab5ee3fc7815f7f60a4d55c5b93295441
Component: engine
 2016-12-02 23:56:42 +01:00
Victor Vieux fa830dbed4 update poule.yml 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: d2920bb31127aa83c8cd0c0534131342fd592406
Component: engine
 2016-12-02 14:54:34 -08:00
Yong Tang eaac95defc Add ID field for docker plugin ls 
This fix tries to address the enhancement proposed in 28708 to display
ID field for the output of `docker plugin ls`.

This fix add `ID` field to the output of `docker plugin ls`

Related docs has been updated.

This fix fixes 28708.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8a226ed6432a0614b25298fef872c98794f65ba9
Component: engine
 2016-12-02 13:42:50 -08:00
Alexander Morozov 34d513c5af Merge pull request #29075 from cpuguy83/29070_fix_tmpfs_opts 
Fix issue where TmpfsOptions are not sent to swarm
Upstream-commit: 0fb0d67008157add34f1e11685e23a691db92644
Component: engine
 2016-12-02 13:40:20 -08:00
Brian Goff 789d09669e Merge pull request #29077 from dnephin/fix-swagger-gen-validate 
Fix swagger-gen validation
Upstream-commit: bed5a0bc2c972243205cf18f30389d47a31537c0
Component: engine
 2016-12-02 14:08:46 -05:00
John Howard 05a05baa0e Windows: make.ps1 and Dockerfile for native builds 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 155435b6ceeb05b2927ecc726216666b898b6459
Component: engine
 2016-12-02 10:46:15 -08:00
Brian Goff 9a6dc26e71 Merge pull request #29069 from vdemeester/29031-manpages-buildarg 
Use DOCKER_BUILD_ARGS on manpages make target
Upstream-commit: fddb5a7f2ab29be441bc797f7e79fffc5cc531d3
Component: engine
 2016-12-02 12:30:36 -05:00
Alexander Morozov 653a60cf01 Merge pull request #29039 from thaJeztah/fix-restart-limit-validation 
Fix restartpolicy max-retry validation
Upstream-commit: 6e023ac7486edf7a2584cb918249b7e5fdaf91d2
Component: engine
 2016-12-02 09:19:54 -08:00
Daniel Nephin 7c952889cb Merge pull request #29071 from bfirsh/29045-use-singular-tag-names-in-swagger 
Use singular tag names in swagger.yaml
Upstream-commit: 334366cdd9b9366f1a0e77d8bb6d41b1884bbfa2
Component: engine
 2016-12-02 12:13:20 -05:00
Daniel Nephin d5e6a04752 Fix swagger-gen validation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f247a99c6ddcaa8448d339b84ae1a029a3048a77
Component: engine
 2016-12-02 12:11:35 -05:00
Anusha Ragunathan 1689338c62 Merge pull request #28789 from yongtang/28735-plugin-inspect-id-or-name 
Allow `docker plugin inspect` to search based on ID or name
Upstream-commit: 57ace38103e1c9fc13e40c57b0fc77361e389f54
Component: engine
 2016-12-02 08:46:47 -08:00
Brian Goff 0f9b87c8d5 Fix issue where TmpfsOptions are not sent to swarm 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a5b3649bfaca5958b25e42ab4f2fc5aa30929521
Component: engine
 2016-12-02 11:43:47 -05:00
Vincent Demeester 38292d7753 Merge pull request #28738 from sathieu/debootstrap_errors 
Improve error reporting in mkimage/debootstrap
Upstream-commit: 1c696806412ba19f7bbb4dc50d353f737ff12d5b
Component: engine
 2016-12-02 17:41:08 +01:00
Alexander Morozov 161d115fd3 Merge pull request #29043 from duglin/Issue29014 
Fix use of **/ in .dockerignore
Upstream-commit: 8895ee0b4d22fb48b496f3f0a0589c2b6c8031a6
Component: engine
 2016-12-02 08:34:45 -08:00
Kenfe-Mickaël Laventure 18b40833fa Merge pull request #29066 from albers/completion-deploy 
Add bash completion for experimental `docker deploy`
Upstream-commit: 2a3bbe571e0f659bb057886fc7071aebc943f8cc
Component: engine
 2016-12-02 07:54:42 -08:00
Kenfe-Mickaël Laventure c93795c45c Merge pull request #25851 from KingEmet/master 
Add registry-specific credential helper support, take 2
Upstream-commit: 16035477003328b20d636f8a9429b4fcfdbb0792
Component: engine
 2016-12-02 07:32:45 -08:00
Ben Firshman b4bd0f1abb Use singular tag names in swagger.yaml 
This is required to make the type generation put things in the
correct directory, but unfortunately makes the names in the
documentation menu look a bit crap.

I think the best solution would be to add a `x-display-name`
extension to tags to determine how the tags show up in the menu,
rather than it depend on the name of the tag. I shall do this in
a follow-up PR - for now, let's fix the breakage.

Fixes #29045

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 30a9249e1598ec3aa2ddb5885568f40466fa05e8
Component: engine
 2016-12-02 14:14:36 +00:00
Brian Goff cf89bf07c6 Merge pull request #29046 from thaJeztah/pin-swagger-version 
pin go-swagger 0.7.4
Upstream-commit: 3d1383f83460e8becdd7c8ed0d57e600b6e2696a
Component: engine
 2016-12-02 08:41:21 -05:00
Vincent Demeester 966bc9c966 Use DOCKER_BUILD_ARGS on manpages make target 
This make it more consistent with the other image builds and allow to
build manpages behind a proxy for example.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 58505ffdeeb453035091ebe59d3de18193b18d1b
Component: engine
 2016-12-02 14:20:30 +01:00
Vincent Demeester e8c489744e Revert "Fix dockerfile parser with empty line after escape" 
This reverts commit 3e1b539e8d0ed4abf695b0a8c42346fba6d5a6b0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6e0666e622a8b1fc19c19eb490d218eebca15edc
Component: engine
 2016-12-02 14:15:55 +01:00
Harald Albers 19eecae26c Add bash completion for experimental docker deploy 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 10f567ec6aaa059626bbe32eb8786bf5a4b447fc
Component: engine
 2016-12-02 04:28:10 -08:00
Harald Albers d154f4f76d Allow selective activation of experimental features in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: af84b7e4417b9b2cc90a8882b0874411e44abe76
Component: engine
 2016-12-02 04:28:10 -08:00
Doug Davis 330477b5f0 Fix use of **/ in .dockerignore 
.dockerignore pattern of **/.foo incorrectly matched **/bar.foo
because **/.foo was getting converted into a .*\.foo regex
instead of (.*/)*\.foo

Closes #29014

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 376bb84c5c8f6183dbb88dae705e1de4182da4c9
Component: engine
 2016-12-02 03:58:54 -08:00
allencloud 25a255f4fc add missing status code in api docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9a1f7b6b0bba7bd28c5ae1fabef7ef267e5fbfbd
Component: engine
 2016-12-02 11:24:45 +08:00
Sebastiaan van Stijn 9e849b264c Fix restartpolicy max-retry validation 
the restart policy validation was moved from
the client to the daemon in 94e95e4711643640701bd614902e75a2d01f12c5

As part of that change, retry-counts < 1
were marked as "invalid".

However, the default is 0 (unlimited), causing

    docker run -d --restart=on-failure nginx

To fail.

This changes the validation to only invalidate
retry-counts < 0.

A test was added, and other tests renamed
to allow running just these tests :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9db5d649aea1c3d4728d0159bb5175a49f77748e
Component: engine
 2016-12-02 02:39:16 +01:00
Sebastiaan van Stijn 61372ea9bb pin go-swagger 0.7.4 
This pins the version of go-swagger used, because
the results generated by different versions
can differ quite a bit (tested between 0.7.2 - 0.7.4),
and can cause CI / validation to fail.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ba20c3e65e33ac6b29294a0eb43d713aa319ef7a
Component: engine
 2016-12-02 01:36:46 +01:00
Justin Cormack abe19725d9 Merge pull request #28996 from Microsoft/jjh/sqlite-remove-windows 
Windows: Factor out sqlite
Upstream-commit: a756c1ac659468bb8d6ec9ee2e1182fc6cae4002
Component: engine
 2016-12-01 13:56:11 -08:00
Mathieu Parent 926963d7d4 Improve error reporting in mkimage/debootstrap 
Signed-off-by: Mathieu Parent <math.parent@gmail.com>
Upstream-commit: ee75c3fca2581a47381f11ba495ecfb7313f9c33
Component: engine
 2016-12-01 21:27:10 +01:00
Aaron Lehmann de12023423 Merge pull request #28997 from cyli/fix-flakey-test 
Update the `TestSwarmLockUnlockCluster` test to be less flakey.
Upstream-commit: 0020398c74e8a08dc6b37a946e025324a3c823be
Component: engine
 2016-12-01 11:32:30 -08:00
Yong Tang 2ac57c6dcf Allow docker plugin inspect to search based on ID or name 
This fix tries to address the issue raised in discussion of
PR 28735 where it was not possible to manage plugin based on
plugin ID. Previously it was not possible to invoke
`docker plugin inspect` with a plugin ID (or ID prefix).

This fix updates the implementation of `docker plugin inspect`
so that it is possbile to search based on a plugin name, or a
plugin ID. A short format of plugin ID (prefix) is also possible,
as long as there is no ambiguity.

Previously the check of `docker plugin inspect` was mostly done
on the client side. This could potentially cause inconsistency
between API and CMD. This fix move all the checks to daemon side
so that API and CMD will be consistent.

An integration test has been added to cover the changes.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0ce6e070f7d1e4b1b478d52b4464f8480dbfd9b7
Component: engine
 2016-12-01 10:44:17 -08:00
Jake Sanders 2e1e2b9b86 Add registry-specific credential helper support 
Signed-off-by: Jake Sanders <jsand@google.com>
Upstream-commit: 07c4b4124b46be30ea3ac7d114c44c4f911ca182
Component: engine
 2016-12-01 10:29:00 -08:00
John Howard c3ca8eccc1 Windows: Factor out sqlite 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3f6127b173949cb36557601a56bc15ae2c45a698
Component: engine
 2016-12-01 09:38:08 -08:00
Tõnis Tiigi 47bb456221 Merge pull request #29015 from coolljt0725/fix_restore_panic 
Fix docker restart panic on machine ungracefully shutdown
Upstream-commit: 0a5cb187b4df6af2d121bd5a6a42c4309b6c709b
Component: engine
 2016-12-01 08:38:02 -08:00
Sebastiaan van Stijn 5bd827a0d2 Merge pull request #29026 from yuexiao-wang/fix-client-test 
Optimize the log info for client test
Upstream-commit: 3879ded936ed8b0b68178ab7f80014b95721cfe5
Component: engine
 2016-12-01 16:30:07 +01:00
yuexiao-wang 00f205d0f0 Optimize the log info for client test 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 40b8ff62431d2005e5801b88dbe1685e89baafe5
Component: engine
 2016-12-02 03:32:04 +08:00
Justin Cormack a9b72b92ed Merge pull request #29027 from runcom/fix-jq 
contrib: download-frozen-image-v2.sh requires jq
Upstream-commit: a227ea62e6f4bc316e0ee14188fc54a3e517c3bc
Component: engine
 2016-12-01 06:26:59 -08:00
Justin Cormack f1b91b00bc Merge pull request #29028 from yuexiao-wang/fix-func-name 
Fix the inconsistent function name for client
Upstream-commit: 006e23c63af5b33ca242b942b6c1367c2fa34765
Component: engine
 2016-12-01 06:26:28 -08:00
yuexiao-wang 76b998fd2d Fix the inconsistent function name for client 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 16233eb055ef03c760f76c276b4491ee3246c0b4
Component: engine
 2016-12-02 04:18:02 +08:00
Antonio Murdaca 0021707a39 contrib: download-frozen-image-v2.sh requires jq 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 887bc48319a650174e3820c677e337969e2d3aca
Component: engine
 2016-12-01 12:40:58 +01:00
Sebastiaan van Stijn 978ceda065 Merge pull request #29025 from lixiaobing10051267/masterManUrl2 
rectify several wrong URLs in branch of man
Upstream-commit: c34efaeca0806e6fd92cc951b85420f0f300b74e
Component: engine
 2016-12-01 12:33:35 +01:00
lixiaobing10051267 ca7deba474 rectify several wrong URLs in branch of man 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 576780369fa8c0b117dec6614db1b8d89cf2721b
Component: engine
 2016-12-01 19:35:27 +08:00
Justin Cormack a7205d3e8b Merge pull request #29019 from lixiaobing10051267/masterRunCOnfig 
check testing code for runconfig and volume
Upstream-commit: 31d4d9e996904782f1ffc5444f1c666c31e18c4e
Component: engine
 2016-12-01 03:00:43 -08:00
Sebastiaan van Stijn 77750af0f0 Merge pull request #28922 from yuexiao-wang/fix-secret 
Fix the inconsistency for secret ls and secrect rm
Upstream-commit: a3be176f139e8fd54b985c5876eb677250890805
Component: engine
 2016-12-01 11:29:58 +01:00
Vincent Demeester b714f8cc17 Merge pull request #29009 from yuexiao-wang/fix-secret-create 
Fix the usage for secret create
Upstream-commit: 782f0ed73d3c6f2f625f7904c0ce1c61847a75bf
Component: engine
 2016-12-01 11:29:45 +01:00