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

29501 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
3d1383f834 Merge pull request #29046 from thaJeztah/pin-swagger-version 
pin go-swagger 0.7.4
 2016-12-02 08:41:21 -05:00
Sebastiaan van Stijn
ba20c3e65e
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>
 2016-12-02 01:36:46 +01:00
Justin Cormack
a756c1ac65 Merge pull request #28996 from Microsoft/jjh/sqlite-remove-windows 
Windows: Factor out sqlite
 2016-12-01 13:56:11 -08:00
Aaron Lehmann
0020398c74 Merge pull request #28997 from cyli/fix-flakey-test 
Update the `TestSwarmLockUnlockCluster` test to be less flakey.
 2016-12-01 11:32:30 -08:00
John Howard
3f6127b173 Windows: Factor out sqlite 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-12-01 09:38:08 -08:00
Tõnis Tiigi
0a5cb187b4 Merge pull request #29015 from coolljt0725/fix_restore_panic 
Fix docker restart panic on machine ungracefully shutdown
 2016-12-01 08:38:02 -08:00
Sebastiaan van Stijn
3879ded936 Merge pull request #29026 from yuexiao-wang/fix-client-test 
Optimize the log info for client test
 2016-12-01 16:30:07 +01:00
yuexiao-wang
40b8ff6243 Optimize the log info for client test 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-02 03:32:04 +08:00
Justin Cormack
a227ea62e6 Merge pull request #29027 from runcom/fix-jq 
contrib: download-frozen-image-v2.sh requires jq
 2016-12-01 06:26:59 -08:00
Justin Cormack
006e23c63a Merge pull request #29028 from yuexiao-wang/fix-func-name 
Fix the inconsistent function name for client
 2016-12-01 06:26:28 -08:00
yuexiao-wang
16233eb055 Fix the inconsistent function name for client 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-02 04:18:02 +08:00
Antonio Murdaca
887bc48319
contrib: download-frozen-image-v2.sh requires jq 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-12-01 12:40:58 +01:00
Sebastiaan van Stijn
c34efaeca0 Merge pull request #29025 from lixiaobing10051267/masterManUrl2 
rectify several wrong URLs in branch of man
 2016-12-01 12:33:35 +01:00
lixiaobing10051267
576780369f rectify several wrong URLs in branch of man 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-01 19:35:27 +08:00
Justin Cormack
31d4d9e996 Merge pull request #29019 from lixiaobing10051267/masterRunCOnfig 
check testing code for runconfig and volume
 2016-12-01 03:00:43 -08:00
Sebastiaan van Stijn
a3be176f13 Merge pull request #28922 from yuexiao-wang/fix-secret 
Fix the inconsistency for secret ls and secrect rm
 2016-12-01 11:29:58 +01:00
Vincent Demeester
782f0ed73d Merge pull request #29009 from yuexiao-wang/fix-secret-create 
Fix the usage for secret create
 2016-12-01 11:29:45 +01:00
yuexiao-wang
5cef55ba91 Fix the use for secret create 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-01 19:48:33 +08:00
lixiaobing10051267
b3e5137856 check testing code for runconfig and volume 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-01 17:07:38 +08:00
Lei Jitang
267422e4d0 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>
 2016-12-01 02:25:24 -05:00
Sebastiaan van Stijn
457d562af1 Merge pull request #28917 from erxian/correct-secret-remove-http-return-code 
correct the http return code of secret remove
 2016-11-30 22:47:28 +01:00
Vincent Demeester
849f659fd9 Merge pull request #28944 from albers/completion-inspect-more-types 
Add more types to bash completion of `docker inspect`
 2016-11-30 22:28:13 +01:00
Alexander Morozov
6151ad19ad Merge pull request #28797 from miaoyq/fix-a-err-of-logger 
Fix a error of the function 'CopyMessage' in 'daemon/logger/logger.go'
 2016-11-30 13:27:40 -08:00
Alexander Morozov
e0681ad0fe Merge pull request #28782 from mlaventure/fix-race-in-restore 
Fix race with containerd events stream on restore
 2016-11-30 13:26:27 -08:00
cyli
6a5b8a640a Update the swarm cluster lock/unlock tests to be less flakey. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-30 13:00:36 -08:00
Vincent Demeester
9d47927984 Merge pull request #28980 from lixiaobing10051267/masterReference 
checkt t.Fatalf information for reference path
 2016-11-30 21:49:26 +01:00
Alexander Morozov
4b3740d009 Merge pull request #28978 from lixiaobing10051267/masterMan 
modify some urls related to reference path
 2016-11-30 12:04:00 -08:00
Alexander Morozov
53d69aeb74 Merge pull request #28885 from vdemeester/revert-service-ps-all 
Revert "Add -a option to service/node ps"
 2016-11-30 12:02:34 -08:00
Alexander Morozov
caaa52c124 Merge pull request #28838 from AkihiroSuda/remove-run-mount 
[Revert #26825] cli: remove `--mount` from `docker run`
 2016-11-30 11:56:42 -08:00
Alexander Morozov
466dd8585d Merge pull request #28864 from sdurrheimer/zsh-completion-stack 
Add zsh completion for 'docker stack' subcommand
 2016-11-30 11:56:03 -08:00
Alexander Morozov
d9bd5aa186 Merge pull request #28746 from albers/completion-stack 
Add bash completion for `docker stack`
 2016-11-30 11:53:46 -08:00
Alexander Morozov
0bf4510a53 Merge pull request #28784 from thaJeztah/add-some-adjectives 
Add some adjectives to the namesgenerator
 2016-11-30 11:46:56 -08:00
Alexander Morozov
33b7596902 Merge pull request #28975 from mavenugo/ln113 
Vendoring libnetwork to address some concurrency issues
 2016-11-30 11:40:12 -08:00
Tõnis Tiigi
dd20fa60b4 Merge pull request #28926 from coolljt0725/fix_save 
Fix docker save with empty timestamp of layer created time
 2016-11-30 11:23:19 -08:00
Vincent Demeester
6367c67ab7 Merge pull request #28487 from cpuguy83/stack_dumps 
Move stack dump dir to exec root
 2016-11-30 20:01:29 +01:00
Anusha Ragunathan
9c2f1669a0 Merge pull request #28965 from cpuguy83/move_plugin_shutdown 
Move plugin shutdown after layerstore shtudown
 2016-11-30 10:15:49 -08:00
Kenfe-Mickael Laventure
9fff9bb761 Fix race with containerd events stream on restore 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-11-30 10:15:39 -08:00
Madhu Venugopal
8f082e418b Vendoring libnetwork to address some concurrency issues 
Addresses #28697, #28845, #28712, #26111

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-11-30 09:31:19 -08:00
Alexander Morozov
523ad6ac71 Merge pull request #28966 from aaronlehmann/push-panic 
distribution: Fix panic on push
 2016-11-30 07:26:58 -08:00
Sebastiaan van Stijn
643b1c0175 Merge pull request #28840 from bfirsh/2016-11-25-api-docs 
Updates to swagger.yaml and API documentation
 2016-11-30 15:49:25 +01:00
Doug Davis
3676bad041 Merge pull request #28972 from Microsoft/jjh/commentcorrection 
Fix incorrect comment
 2016-11-30 08:34:15 -05:00
Doug Davis
4a0e295cd1 Merge pull request #28725 from Microsoft/jjh/builderenvcaseinsensitive 
Windows: Builder case insensitive env
 2016-11-30 08:33:29 -05:00
erxian
21768933fb correct the http return code of secret remove 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-11-30 19:45:45 +08:00
lixiaobing10051267
4b1ff89fae checkt t.Fatalf information for reference path 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-30 17:54:41 +08:00
Sebastiaan van Stijn
6b6cfc63e9 Merge pull request #28934 from lixiaobing10051267/masterPluginDoc 
Give the correct location for plugin documentation
 2016-11-30 10:25:46 +01:00
yuexiao-wang
b4306588e9 Fix the inconsistency for docker secret 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-30 17:23:39 +08:00
Sebastiaan van Stijn
f9ddac3f3c Merge pull request #28854 from coolljt0725/igore_close_stderr_error 
Ignore "failed to close stdin" if container or process not found
 2016-11-30 10:23:27 +01:00
Vincent Demeester
768f4ce02b Merge pull request #28899 from aaronlehmann/dont-pull-image-id 
Don't resolve or pull images referenced by ID
 2016-11-30 10:08:43 +01:00
Vincent Demeester
b5f4d3f716 Merge pull request #28954 from darrenstahlmsft/UnknownBlobRetry 
Stop retrying pull on UnkownBlob error
 2016-11-30 10:05:16 +01:00
lixiaobing10051267
b069690827 modify some urls related to reference path 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-30 16:48:39 +08:00