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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
54c33a1c13
Fix the use for secret create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 5cef55ba9178604c67d99774526cf055c7d0aafe
Component: engine
2016-12-01 19:48:33 +08:00
35ebad64e3
check testing code for runconfig and volume
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: b3e5137856ffd07e179d977eec74ee0566f1bb26
Component: engine
2016-12-01 17:07:38 +08:00
dc6f3f84fc
Fix docker restart panic on machine ungracefully shutdown
...
Machine ungracefully shutdown leaves a lot of container has a
Running=true state.
```
$ cat config.v2.json | jq .
"Running": true,
"Paused": false,
"Restarting": false,
```
And the next docker start will fail with panic.
```
time="2016-12-01T01:54:45.086446715-05:00" level=warning msg="libcontainerd: client is out of sync, restore was called on a fully synced container (49f41ad5ca0be860622d9190673b5816d012022fb2c1794560ec4851e7cfec6a)."
time="2016-12-01T01:54:45.087046004-05:00" level=warning msg="libcontainerd: failed to retrieve container 49f41ad5ca0be860622d9190673b5816d012022fb2c1794560ec4851e7cfec6a state: rpc error: code = 2 desc = containerd: container not found"
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x8 pc=0x5db7f3]
goroutine 57 [running]:
panic(0x16a8e60, 0xc420010130)
/usr/local/go/src/runtime/panic.go:500 +0x1a1
github.com/docker/docker/libcontainerd.(*client).Restore(0xc4202e1a40, 0xc420415000, 0x40, 0xc42015a0b0, 0x0, 0x0, 0x0, 0x0, 0x0)
/go/src/github.com/docker/docker/libcontainerd/client_linux.go:457 +0x553
github.com/docker/docker/daemon.(*Daemon).restore.func1(0xc4201c46f0, 0xc4202581e0, 0xc4201c46e8, 0xc42047bfb0, 0xc42047bf80, 0xc42047bf50, 0xc42024ba10, 0xc420512c00)
/go/src/github.com/docker/docker/daemon/daemon.go:205 +0x198
created by github.com/docker/docker/daemon.(*Daemon).restore
/go/src/github.com/docker/docker/daemon/daemon.go:260 +0x7bb
```
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 267422e4d08244e701ce049ab55ca0ad9879ba78
Component: engine
2016-12-01 02:25:24 -05:00
c2f7699391
Merge pull request #28917 from erxian/correct-secret-remove-http-return-code
...
correct the http return code of secret remove
Upstream-commit: 457d562af128a765b48389681399903ca0e679cf
Component: engine
2016-11-30 22:47:28 +01:00
c7b13ddf55
Merge pull request #28944 from albers/completion-inspect-more-types
...
Add more types to bash completion of `docker inspect`
Upstream-commit: 849f659fd90c27b61b72ef9b0eba45edfe6bf85e
Component: engine
2016-11-30 22:28:13 +01:00
bb58024492
Merge pull request #28797 from miaoyq/fix-a-err-of-logger
...
Fix a error of the function 'CopyMessage' in 'daemon/logger/logger.go'
Upstream-commit: 6151ad19ad2a5cd2ec2c3afc08ed07f64623ae36
Component: engine
2016-11-30 13:27:40 -08:00
5ed6825cff
Merge pull request #28782 from mlaventure/fix-race-in-restore
...
Fix race with containerd events stream on restore
Upstream-commit: e0681ad0fed93876382dad3877bae0171bd43829
Component: engine
2016-11-30 13:26:27 -08:00
afd7b14845
Update the swarm cluster lock/unlock tests to be less flakey.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 6a5b8a640a81aa27acda64221f95f02032a43ce5
Component: engine
2016-11-30 13:00:36 -08:00
6b021be636
Merge pull request #28980 from lixiaobing10051267/masterReference
...
checkt t.Fatalf information for reference path
Upstream-commit: 9d4792798409cb8a1ba00b10296b97da6f7262b8
Component: engine
2016-11-30 21:49:26 +01:00
6c399e963a
Merge pull request #28978 from lixiaobing10051267/masterMan
...
modify some urls related to reference path
Upstream-commit: 4b3740d0094868bd24f81b7be4cab19bad5d93c2
Component: engine
2016-11-30 12:04:00 -08:00
cefbd9b7e9
Merge pull request #28885 from vdemeester/revert-service-ps-all
...
Revert "Add -a option to service/node ps"
Upstream-commit: 53d69aeb74962709464e0888f4a5c755be2c8e4d
Component: engine
2016-11-30 12:02:34 -08:00
a66f1eed5f
Merge pull request #28838 from AkihiroSuda/remove-run-mount
...
[Revert #26825 ] cli: remove `--mount` from `docker run`
Upstream-commit: caaa52c124539acb396c0b711ab95bc7ed459540
Component: engine
2016-11-30 11:56:42 -08:00
