kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
29518 commits 10 branches 356 tags 299 MiB
Commit graph

29518 commits

Author SHA1 Message Date
Brian Goff
fddb5a7f2a Merge pull request from vdemeester/29031-manpages-buildarg 
Use DOCKER_BUILD_ARGS on manpages make target
 2016-12-02 12:30:36 -05:00
Alexander Morozov
6e023ac748 Merge pull request from thaJeztah/fix-restart-limit-validation 
Fix restartpolicy max-retry validation
 2016-12-02 09:19:54 -08:00
Daniel Nephin
334366cdd9 Merge pull request from bfirsh/29045-use-singular-tag-names-in-swagger 
Use singular tag names in swagger.yaml
 2016-12-02 12:13:20 -05:00
Anusha Ragunathan
57ace38103 Merge pull request from yongtang/28735-plugin-inspect-id-or-name 
Allow `docker plugin inspect` to search based on ID or name
 2016-12-02 08:46:47 -08:00
Vincent Demeester
1c69680641 Merge pull request from sathieu/debootstrap_errors 
Improve error reporting in mkimage/debootstrap
 2016-12-02 17:41:08 +01:00
Alexander Morozov
8895ee0b4d Merge pull request from duglin/Issue29014 
Fix use of **/ in .dockerignore
 2016-12-02 08:34:45 -08:00
Kenfe-Mickaël Laventure
2a3bbe571e Merge pull request from albers/completion-deploy 
Add bash completion for experimental `docker deploy`
 2016-12-02 07:54:42 -08:00
Kenfe-Mickaël Laventure
1603547700 Merge pull request from KingEmet/master 
Add registry-specific credential helper support, take 2
 2016-12-02 07:32:45 -08:00
Ben Firshman
30a9249e15
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 

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-12-02 14:14:36 +00:00
Brian Goff
3d1383f834 Merge pull request from thaJeztah/pin-swagger-version 
pin go-swagger 0.7.4
 2016-12-02 08:41:21 -05:00
Vincent Demeester
58505ffdee
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>
 2016-12-02 14:20:30 +01:00
Harald Albers
10f567ec6a Add bash completion for experimental docker deploy 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-12-02 04:28:10 -08:00
Harald Albers
af84b7e441 Allow selective activation of experimental features in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-12-02 04:28:10 -08:00
Doug Davis
376bb84c5c 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 

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-12-02 03:58:54 -08:00
Sebastiaan van Stijn
9db5d649ae
Fix restartpolicy max-retry validation 
the restart policy validation was moved from
the client to the daemon in 94e95e4711

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>
 2016-12-02 02:39:16 +01: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 from Microsoft/jjh/sqlite-remove-windows 
Windows: Factor out sqlite
 2016-12-01 13:56:11 -08:00
Mathieu Parent
ee75c3fca2 Improve error reporting in mkimage/debootstrap 
Signed-off-by: Mathieu Parent <math.parent@gmail.com>
 2016-12-01 21:27:10 +01:00
Aaron Lehmann
0020398c74 Merge pull request from cyli/fix-flakey-test 
Update the `TestSwarmLockUnlockCluster` test to be less flakey.
 2016-12-01 11:32:30 -08:00
Yong Tang
0ce6e070f7 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>
 2016-12-01 10:44:17 -08:00
Jake Sanders
07c4b4124b Add registry-specific credential helper support 
Signed-off-by: Jake Sanders <jsand@google.com>
 2016-12-01 10:29:00 -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 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 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 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 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 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 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 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 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 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 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 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 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 from lixiaobing10051267/masterReference 
checkt t.Fatalf information for reference path
 2016-11-30 21:49:26 +01:00
Alexander Morozov
4b3740d009 Merge pull request from lixiaobing10051267/masterMan 
modify some urls related to reference path
 2016-11-30 12:04:00 -08:00
Alexander Morozov
53d69aeb74 Merge pull request 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 from AkihiroSuda/remove-run-mount 
[Revert ] cli: remove `--mount` from `docker run`
 2016-11-30 11:56:42 -08:00
Alexander Morozov
466dd8585d Merge pull request 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 from albers/completion-stack 
Add bash completion for `docker stack`
 2016-11-30 11:53:46 -08:00
Alexander Morozov
0bf4510a53 Merge pull request 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 from mavenugo/ln113 
Vendoring libnetwork to address some concurrency issues
 2016-11-30 11:40:12 -08:00