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

29126 commits

This branch
This branch
All branches
Author SHA1 Message Date
Victor Vieux
9f348d5625 fix gofmt in master 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 15:20:19 -08:00
Michael Crosby
8851e6ba70 Merge pull request #28603 from thaJeztah/flipping-hosts 
swap position of "host" and "ip"
 2016-11-18 14:58:04 -08:00
Victor Vieux
e67664887d Merge pull request #28590 from mlaventure/update-containerd 
Update containerd & runc
 2016-11-18 14:08:56 -08:00
Sebastiaan van Stijn
f1b9df9172
swap position of "host" and "ip" 
the service definition uses the format as defined
in  http://man7.org/linux/man-pages/man5/hosts.5.html
(IP_address canonical_hostname [aliases...])

This format is the _reverse_ of the format used in
the container API.

Commit f32869d956
inadvertently used the incorrect order.

This fixes the order, and correctly sets it to;

    IP-Address hostname

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-11-18 22:04:27 +01:00
Aaron Lehmann
30d0c3899e Merge pull request #28421 from aaronlehmann/digest-pinning-warnings 
Return warnings from service create/update when digest pinning fails
 2016-11-18 11:33:17 -08:00
Tõnis Tiigi
eb0fc787e6 Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking 
judge manager before unlocking
 2016-11-18 11:27:48 -08:00
Aaron Lehmann
948e60691e Return warnings from service create and service update when digest pinning fails 
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-18 09:31:31 -08:00
Brian Goff
06e92cc2c1 Merge pull request #28577 from chchliang/defercode 
function setupOOMScoreAdj file close illogicality
 2016-11-18 11:48:58 -05:00
Kenfe-Mickael Laventure
8b1aeb22fe Update containerd & runc 
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-11-18 08:15:20 -08:00
allencloud
972a246c67 judge manager before unlocking 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 23:49:40 +08:00
Alexander Morozov
8874f80e67 Merge pull request #28586 from felipeweb/fix_infinite_recursion 
fix infinite recursion
 2016-11-18 06:44:52 -08:00
Doug Davis
c41ff780d8 Merge pull request #28578 from allencloud/remove-redudant-file-Close 
remove redundant file Close
 2016-11-18 08:21:58 -05:00
Justin Cormack
b4e69fb3aa Merge pull request #28580 from allencloud/fix-nits-in-error-message 
fix typos
 2016-11-18 13:18:23 +00:00
Brian Goff
3e31f3744e Merge pull request #28584 from justincormack/devpts-multiple-4.8 
Fix check config script on 4.8 kernels
 2016-11-18 08:18:08 -05:00
Felipe Oliveira
271b1f2756 fix infinite recursion 
Signed-off-by: Felipe Oliveira <felipeweb.programador@gmail.com>
 2016-11-18 10:57:50 -02:00
Vincent Demeester
6c447f552c Merge pull request #28354 from ripcurld00d/tag_creation 
Change the docker-tag usage text to be clearer
 2016-11-18 13:02:40 +01:00
Justin Cormack
228ee16df3 Fix check config script on 4.8 kernels 
DEVPTS_MULTIPLE_INSTANCES is no longer an option, it is always set, so
do not check for this post 4.8.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-18 11:42:05 +00:00
Vincent Demeester
c0acfd1dad Merge pull request #28540 from lixiaobing10051267/masterNewContainerId 
expected new_container_id while testing ContainerCommit
 2016-11-18 12:13:30 +01:00
Vincent Demeester
9e43a68f69 Merge pull request #28565 from crosbymichael/cputime 
Fix cfs period calculation
 2016-11-18 12:12:53 +01:00
allencloud
3dca62cfb1 remove redundant file Close 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 17:50:02 +08:00
chchliang
e82fa89bcd function setupOOMScoreAdj file close illogicality 
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
 2016-11-18 17:34:01 +08:00
Michael Crosby
aff99136b4 Fix cfs period calculation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-11-18 00:47:43 -08:00
Boaz Shuster
039aca05c2 Change the docker-tag usage text to be clearer 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2016-11-18 10:34:02 +02:00
allencloud
1f039a66ac fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 15:51:36 +08:00
Tõnis Tiigi
27699ba8b2 Merge pull request #28558 from cpuguy83/add_vim 
Add vim to Dockerfile
 2016-11-17 21:14:19 -08:00
lixiaobing10051267
773ae28dae expected new_container_id while testing ContainerCommit 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-18 10:21:04 +08:00
Brian Goff
7d1a72a286 Add vim to Dockerfile 
Why? Most of the time I end up needing an editor when in `make shell`.
Spent much time doing `apt-get update && apt-get install vim`.
Since we're already installing vim-common anyway...

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-17 20:02:26 -05: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