dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-10 17:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,367 Commits 19 Branches 592 Tags
772db11fd0cfdf3c22fb93ba69742e81c4a695bb
Commit Graph

27367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
772db11fd0 Merge pull request #26712 from BlueMonday/master 
Fix regex for the json-file logger opts in overview.md
 2016-09-19 21:01:51 +02:00
Sebastiaan van Stijn
5bcaa0e4bb Merge pull request #26715 from thaJeztah/move-mary-to-alumni 
Move Mary to alumni
 2016-09-19 20:15:23 +02:00
Steven Erenst
e9a9015e38 Fix regex for the json-file logger opts in overview.md 
The regex used to describe the max-file and max-size logging options for
the json-file logger were incorrect. The regexes would only match a
single character (a digit or a literal +). Instead the regexes should
match 1 or more digits.

The character class for the units of the max-size also included a pipe
which meant that the regex would match 1| instead of only matching 1m,
1k, and 1g.

Signed-off-by: Steven Erenst <stevenerenst@gmail.com>
 2016-09-19 10:47:40 -07:00
Kenfe-Mickaël Laventure
3fd3d28f5f Merge pull request #26505 from Microsoft/jjh/ocistep1 
Windows OCI convergence step 1
 2016-09-19 10:23:11 -07:00
Tõnis Tiigi
b72c7f74a6 Merge pull request #26577 from Microsoft/jjh/fstabmount 
Windows: Move to fstab options as per OCI
 2016-09-19 10:13:46 -07:00
Sebastiaan van Stijn
9d2d89ce6f Merge pull request #26704 from clbn/patch-1 
Fix typos in installation doc for Mac
 2016-09-19 18:25:35 +02:00
Sebastiaan van Stijn
1161b10a0a Merge pull request #26708 from thaJeztah/add-evan-as-curator 
Add Evan as curator
 2016-09-19 18:18:51 +02:00
Sebastiaan van Stijn
6da5889c5b Move Mary to alumni 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 18:09:30 +02:00
Brian Goff
622faab3f6 Merge pull request #26695 from AkihiroSuda/fix-pause-race 
Fix a race in libcontainerd/pausemonitor_linux.go
 2016-09-19 12:03:56 -04:00
Sebastiaan van Stijn
bb6fe56e88 Merge pull request #26268 from AkihiroSuda/eventsjsonl 
add `docker events --format`
 2016-09-19 17:30:27 +02:00
Sebastiaan van Stijn
32161fc052 Add Evan as curator 
Evan is gonna help triaging issues, so
adding him as a "curator" to make it official

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 17:09:34 +02:00
Alex Olshansky
f7af5cc780 Fix typos in installation doc for Mac 
Signed-off-by: Alex Olshansky <i@creagenics.com>
 2016-09-19 16:04:46 +02:00
Sebastiaan van Stijn
c2d6e76a70 Merge pull request #26701 from thaJeztah/fix-markdown-formatting 
Fix Markdown formatting and missing prompt in service create
 2016-09-19 14:58:06 +02:00
Sebastiaan van Stijn
533b00da8b Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 13:57:39 +02:00
Sebastiaan van Stijn
b16bfbaddd Merge pull request #26699 from thaJeztah/update-sshd-example 
Update sshd example to use ubuntu 16.04
 2016-09-19 13:17:51 +02:00
Sebastiaan van Stijn
b81d12e7a1 Update sshd example to use ubuntu 16.04 
Although the example is just for illustrational
purposes, many users are now switching to
Ubuntu 16.04 as the "default" version for Ubuntu,
so updating the example for those that use
this example as a starting point.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 12:52:13 +02:00
Sebastiaan van Stijn
c496b4eb1b Merge pull request #25776 from thaJeztah/add-basic-mount-docs 
Add --mount syntax documentation to CLI reference
 2016-09-19 12:17:07 +02:00
Misty Stanley-Jones
5880d62953 Misty's edits and additions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
 2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
eb3a01eb43 Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 11:56:59 +02:00
Sebastiaan van Stijn
1ccd79e1a9 Merge pull request #26682 from yuexiao-wang/fix-typo 
Fix typo for docs reference
 2016-09-19 11:14:46 +02:00
Sebastiaan van Stijn
abd02a9ba0 Merge pull request #26691 from YuPengZTE/devSUSE 
Add prompt of $
 2016-09-19 10:45:23 +02:00
Akihiro Suda
69f00a137c Fix a race in libcontainerd/pausemonitor_linux.go 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-19 07:42:21 +00:00
YuPengZTE
638546d120 Add prompt of $ 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-19 10:46:25 +08:00
Brian Goff
45a8f68026 Merge pull request #26616 from tonistiigi/id-digest 
Generalize content addressable and reference storage
 2016-09-18 09:40:16 -04:00
Brian Goff
bc60f5af84 Merge pull request #26650 from Microsoft/jjh/firststart 
Windows: OCI remove first start
 2016-09-18 09:27:10 -04:00
Brian Goff
112ba3637d Merge pull request #26578 from Microsoft/jjh/ociuser 
Windows: Unify OCI user struct
 2016-09-18 09:20:45 -04:00
Brian Goff
fcf77620d6 Merge pull request #26675 from pestophagous/fix-typo-understanding-docker 
Fix typo in docs. s/methodoligies/methodologies/
 2016-09-18 09:09:40 -04:00
Sebastiaan van Stijn
1444401b16 Merge pull request #26678 from YuPengZTE/devSUDO 
Add bash symbol for sudo
 2016-09-18 13:36:13 +02:00
yuexiao-wang
0f0b0db842 fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-18 11:00:19 +08:00
Alexander Morozov
beea4d93dc Merge pull request #26676 from Microsoft/jjh/tp5graphdriver 
Windows: Remove TP5 hack from graphdriver
 2016-09-17 19:54:58 -07:00
YuPengZTE
ced2729841 The hit is missed 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-18 09:38:20 +08:00
John Howard
56952e2159 Merge pull request #26662 from WeiZhang555/fix-flaky-unit-test 
Fix flaky unit test
 2016-09-17 18:32:11 -07:00
John Howard
f61315f0df Windows: Remove TP5 hack from graphdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-17 16:16:50 -07:00
pestophagous
191adcfb63 Fix typo in docs. s/methodoligies/methodologies/ 
Signed-off-by: K Heller <pestophagous@gmail.com>
 2016-09-17 15:37:03 -07:00
Alexander Morozov
0589358eec Merge pull request #26669 from cpuguy83/vendor_syslog 
re-vendor syslog package
 2016-09-17 10:27:21 -07:00
John Howard
4a0419f536 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
 2016-09-17 09:31:24 -07:00
Brian Goff
f528690674 re-vendor syslog package 
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-09-17 10:25:05 -04:00
Sebastiaan van Stijn
788a8a3cac Merge pull request #26634 from thaJeztah/fix-api-docs-for-services 
Fix service and tasks API documentation
 2016-09-17 16:13:15 +02:00
Sebastiaan van Stijn
1fb556bb7e Merge pull request #26654 from thaJeztah/sync-api-docs 
Synchronize API docs
 2016-09-17 16:11:42 +02:00
Vincent Demeester
e54171378c Merge pull request #26656 from miaoyq/rename-name-to-destination 
Rename the variable 'name' to 'destination'
 2016-09-17 16:01:02 +02:00
Vincent Demeester
5d7b725071 Merge pull request #26606 from dnephin/move_errors 
Move errors package to api/errors
 2016-09-17 16:00:38 +02:00
Vincent Demeester
1d8ad2974e Merge pull request #26643 from allencloud/validate-two-service-modes-in-request 
return err when both two service modes in request
 2016-09-17 15:50:55 +02:00
Brian Goff
6d8598f4bb Merge pull request #26649 from dperny/add-comment-to-endpointspec 
Added comments to PortConfig for greater clarity
 2016-09-17 08:16:32 -04:00
Brian Goff
3548356957 Merge pull request #26555 from miaoyq/refactor-aufsMount 
refactor the function 'aufsMount' in 'daemon/graphdriver/aufs/aufs.go'
 2016-09-17 08:04:18 -04:00
Sebastiaan van Stijn
2f5b379192 Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version 
Move HostConfig.Mounts to correct API version
 2016-09-17 13:53:37 +02:00
Zhang Wei
bc5768733d Fix flaky unit test 
Fix flaky test `TestHTTPTimeout` caused by precision problem.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-17 19:40:58 +08:00
allencloud
c413d4177b return err when both two service mode in request 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-17 19:04:46 +08:00
Yanqiang Miao
57cec5a777 Rename the variable 'name' to 'destination' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-09-17 10:52:11 +08:00
Sebastiaan van Stijn
d93a62e9be Merge pull request #26266 from YuPengZTE/dev 
The etc and dot is seprated
 2016-09-17 03:37:00 +02:00
Sebastiaan van Stijn
1c117aa8cc Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
 2016-09-17 03:32:23 +02:00