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

29100 commits

This branch
This branch
All branches
Author SHA1 Message Date
allencloud
1f039a66ac fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 15:51:36 +08:00
Sebastiaan van Stijn
c6d69ea9e9 Merge pull request #28477 from vdemeester/update-reference-filter-cli-reference 
Update `images` cli reference with reference filter
 2016-11-18 01:34:48 +01:00
Michael Crosby
4b29f404b1 Merge pull request #28458 from yongtang/28456-cpus-error-message 
Fix error messages for `--cpus` from daemon
 2016-11-17 16:29:21 -08:00
Sebastiaan van Stijn
d9612db974 Merge pull request #28560 from akshaykarle/master 
fix a typo
 2016-11-18 01:03:05 +01:00
Michael Crosby
bbac9eeae6 Merge pull request #28532 from stevvooe/disabled-swarm-service-unavailable 
api/server/httputils: service unavailable for disable swarm
 2016-11-17 15:16:23 -08:00
Michael Crosby
e61ad74655 Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template 
Use `map[string]bool` for `preProcessor` to ignore unknown fields
 2016-11-17 15:13:02 -08:00
Vincent Demeester
870f52533f Merge pull request #28557 from vdemeester/fix-tini-compilation-error-on-photon 
Update Tini to fix photon build-rpm compilation errors
 2016-11-17 23:40:39 +01:00
Vincent Demeester
423c014038 Merge pull request #28552 from tomwilkie/fix-multi-read-seeker 
Fix use of cap in MultiReadSeeker; possible data corruption bug.
 2016-11-17 23:40:30 +01:00
Tõnis Tiigi
43de09045c Merge pull request #28554 from vieux/showhelp 
refactor help func in CLI
 2016-11-17 14:27:26 -08:00
Akshay Karle
2d08a76421 fix a typo 
Signed-off-by: Akshay Karle <akshay.a.karle@gmail.com>
 2016-11-17 16:51:37 -05:00
Brian Goff
6969c98a3c Merge pull request #28383 from zteBill/fix-useless-var 
Remove needless var
 2016-11-17 16:18:07 -05:00
Tom Wilkie
3a05545851 s/bCap/bLen/ 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2016-11-17 21:05:09 +00:00
Vincent Demeester
ce33d4e1c3
Update Tini to fix photon build-rpm compilation errors 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-17 22:03:32 +01:00
Sebastiaan van Stijn
f297dea657 Merge pull request #28551 from cpuguy83/28517_dont_spew_so_much 
Reduce spew data dumped
 2016-11-17 21:37:06 +01:00
Brian Goff
22dccaf2d6 Merge pull request #28538 from yongtang/11162016-Log-Logf-fix 
Fix several issues with `go vet` and `gofmt -s`
 2016-11-17 15:21:22 -05:00
Tõnis Tiigi
b59ee9486f Merge pull request #28531 from cpuguy83/wait_stop_ctx 
Use WaitWithContext for WaitStop
 2016-11-17 11:52:19 -08:00
Stephen J Day
1d90d76048
api/server/httputils: service unavailable for disable swarm 
When swarm-mode is disabled, we need to return an error indicating this.
406 was chosen for the "Not Acceptable" verbiage, but this code has
specific semantics in relation to the `Accept` header, which aren't
applicable here.

We now use a 503 for this case. While it is not a perfect match, it does
make it clear that the particular "service" (read: API endpoint) is not
available. The body of the message provides the user with enough
information to take action on it by enabling swarm-mode and ensuring the
service is available.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-11-17 11:43:45 -08:00
Brian Goff
31a050e31b Merge pull request #28290 from KevinTHU/master 
fix "fatal error: concurrent map read and map write" bugs when we concurrently execute lots of delete volumes and create or list volumes tasks
 2016-11-17 13:59:09 -05:00
Aaron Lehmann
6d0f7bb4c7 Merge pull request #28523 from yongtang/28519-service-inspect-pretty-crash 
Fix crash caused by `docker service inspect --pretty`
 2016-11-17 10:56:57 -08:00
Victor Vieux
bf95472105 refactor help func in CLI 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-17 10:54:10 -08:00
Tom Wilkie
158bb9bbd5 Fix use of cap in MultiReadSeeker 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2016-11-17 18:36:35 +00:00
Alexander Morozov
0a5a41a438 Merge pull request #28415 from Microsoft/jjh/builduser 
Windows: Allow `USER` in builder
 2016-11-17 10:32:56 -08:00
Alexander Morozov
c2fbf0871d Merge pull request #28462 from tonistiigi/health-deadlock 
Fix deadlock on cancelling healthcheck
 2016-11-17 10:30:57 -08:00
Alexander Morozov
8a6c5358af Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists 
remove unused error ErrPendingSwarmExists
 2016-11-17 10:17:47 -08:00
Brian Goff
4130eb24e9 Reduce spew data dumped 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-17 13:10:48 -05:00
Vincent Demeester
a0d7b34d9c
Update images cli reference with reference filter 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-17 15:34:17 +01:00
Brian Goff
57f44b4598 Merge pull request #28526 from aluzzardi/master-revendor-swarmkit 
[master] Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
 2016-11-17 09:33:18 -05:00
Yong Tang
ace786e9d5 Fix several issues with go vet and go fmt 
For some reason, `go vet` and `go fmt` validate does not capture
several issues.

The following was the output of `go vet`:
```
ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$'
cli/command/formatter/container_test.go:393: possible formatting directive in Log call
volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool
```

The following was the output of `go fmt -s`:
```
ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor
cli/command/stack/list.go
daemon/commit.go
```

Fixed above issues with `go vet` and `go fmt -s`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-17 06:31:28 -08:00
Sebastiaan van Stijn
85bc735b4a Merge pull request #28498 from rhvgoyal/rwlayer-opts 
Move CreateRWLayer() parameters in a struct
 2016-11-17 13:57:59 +01:00
Sebastiaan van Stijn
a58e3e7fef Merge pull request #28512 from anusha-ragunathan/fix_enable 
Cleanup after plugin install.
 2016-11-17 10:16:47 +01:00
zteBill
4b3a1bbda5 make each return explicitly 
Signed-off-by: zteBill <bi.zhenkun@zte.com.cn>
 2016-11-17 17:13:25 +08:00
Sebastiaan van Stijn
f47ae61293 Merge pull request #28534 from cizixs/changelog-typo 
Fix 1.13.0 changelog typo
 2016-11-17 09:57:03 +01:00
Vincent Demeester
465c0484dc Merge pull request #28521 from aaronlehmann/omitempty 
api: Remove omitempty tag on Parallelism
 2016-11-17 09:05:29 +01:00
Victor Vieux
e93bd7b8ce Merge pull request #28530 from stevvooe/derandom-error-codes 
api/server/httputils: ensure consistent status code
 2016-11-16 23:52:52 -08:00
Victor Vieux
d75f5178f8 Merge pull request #28537 from YuPengZTE/devTypo 
Fix the typo
 2016-11-16 23:49:52 -08:00
yupeng
9551dd03cf Fix the typo 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-17 14:13:38 +08:00
allencloud
7777557a3a remove unused error ErrPendingSwarmExists 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-17 14:06:08 +08:00
cizixs
e99e694502 Fix 1.13.0 changelog typo 
Signed-off-by: wei wu <wuwei4455@gmail.com>
 2016-11-17 12:24:44 +08:00
Brian Goff
36d6d76a41 Use WaitWithContext for WaitStop 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-16 22:08:37 -05:00
Stephen J Day
3484e02590
api/server/httputils: ensure consistent status code 
Error code resolution is powered by string matching. Not the greatest
thing in the world and I hope no one is proud of this code, but it
works. However, because a map is used, the iteration order of the map is
random, such that if an error matches two of the snippets, it may return
a different error code depending on the seed of the hashmap. This change
converts it to use a slice instead.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-11-16 18:58:55 -08:00
He Xin
19bd1cee23 fix bugs 'fatal error: concurrent map read and map write' to change VolumeStore.globalLock type from Mutex to RWMutex, and add globalLock.RLock() for the read of names, refs, labels and options in VolumeStore 
Signed-off-by: He Xin <he_xinworld@126.com>
 2016-11-17 10:48:19 +08:00
Andrea Luzzardi
fbe8790759 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-16 18:15:15 -08:00
Yong Tang
b6857e91c1 Fix crash caused by docker service inspect --pretty 
This fix tries to fix the crash caused by `docker service inspect --pretty`,
by performing necessary nil pointer check.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-16 17:26:03 -08:00
Victor Vieux
956ff8f773 Merge pull request #28505 from Microsoft/jjh/revert27884 
Windows: Revert 27884
 2016-11-16 17:12:19 -08:00
Sebastiaan van Stijn
a5dce0cb1a Merge pull request #28100 from nwt/disable-v1-protocol-for-default-registry 
Disable v1 protocol for the default registry
 2016-11-17 01:25:31 +01:00
Aaron Lehmann
d8b8b12994 api: Remove omitempty tag on Parallelism 
It doesn't make sense to use omitempty here. 0 is a meaningful value and
it's different from the default. If someone sets Parallelism to 0, we
want to show that Parallelism is 0, not hide the field.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-16 16:21:25 -08:00
Victor Vieux
bb845dbd42 Merge pull request #28501 from tonistiigi/fix-daemon-cmd 
Skip cli initialization for daemon command
 2016-11-16 15:37:43 -08:00
Sebastiaan van Stijn
3f9dc02135 Merge pull request #28322 from Microsoft/jjh/api1.26 
Bump API to v1.26
 2016-11-17 00:01:46 +01:00
Victor Vieux
895bf6b053 Merge pull request #27749 from riyazdf/plugin-doc-edits 
Edits to plugin docs after building authz plugin
 2016-11-16 15:01:16 -08:00
Anusha Ragunathan
1144f8f1d4 Cleanup after plugin install. 
During error cases, we dont cleanup correctly. This commit takes care
of removing the plugin, if there are errors after the pull passed. It
also shuts down the plugin, if there are errors after the plugin in the
enable path.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-16 14:45:51 -08:00