dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-13 17:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,327 Commits 19 Branches 593 Tags
191adcfb637ea1b52d2da9a75e4e1e4938d9550c
Commit Graph

27327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sebastiaan van Stijn
30839b0688 Merge pull request #26540 from sfsmithcha/remove_charles_from_maintainers 
removes sfsmithcha from maintainers
 2016-09-17 03:28:23 +02:00
Sebastiaan van Stijn
0bd281c7cb Merge pull request #26558 from lixiaobing10051267/masterSymbol2 
add bash symbol for docker network inspect
 2016-09-17 03:26:55 +02:00
Sebastiaan van Stijn
258fa6c23f Merge pull request #26557 from schmunk42/patch-1 
fix typo
 2016-09-17 03:26:11 +02:00
Sebastiaan van Stijn
53b1dcb25c Synchronize API docs 
This synchronizes changes between API versions, and:

- applies e0a552504e to
  older versions of the documentation
- applies a2a0a03e2b to
  API version 1.25
- syncs some minor differences

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-17 03:02:12 +02:00
Sebastiaan van Stijn
cd73ceffd8 Move HostConfig.Mounts to correct API version 
This was added in fc7b904dce,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-17 02:36:07 +02:00
Sebastiaan van Stijn
d69409fd43 Fix service and tasks API documentation 
The documentation contained some outdated information
on these endpoints.

This change fixes those parts of the documentation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-17 02:29:38 +02:00
Drew Erny
55454752f8 Added comments to PortConfig for greater clarity 
I always forget which one is which. Now, I can't forget. This is
probably in the docs somewhere but now it's handy at a glance.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2016-09-16 14:47:35 -07:00
Sebastiaan van Stijn
94bc2b1bc0 Merge pull request #26387 from Microsoft/jjh/securityopts 
Only output security options if there are any
 2016-09-16 23:05:30 +02:00
Doug Davis
61639bf63d Merge pull request #26647 from jbodah/patch-1 
Remove extra paren in `run --link` docs
 2016-09-16 21:38:17 +02:00
Josh Bodah
484fbe236d Remove extra paren in run --link docs 
Signed-off-by: Josh Bodah <jb3689@yahoo.com>
 2016-09-16 15:32:12 -04:00
John Howard
340e5233b2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 11:56:15 -07:00
Vincent Demeester
8a7006ff8e Merge pull request #26620 from runcom/fix-docs 
docs: reference: api: clarify pull all tags
 2016-09-16 20:56:04 +02:00
Michael Crosby
efe4e914ef Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements 
Splunk Logging Driver performance improvements
 2016-09-16 10:22:09 -07:00
John Howard
dd3d223a7e Only output security options if there are any 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 10:05:21 -07:00
Daniel Nephin
bcb0405239 Use apiError in server version middleware. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-16 12:27:14 -04:00
Daniel Nephin
c452e1bfe6 Move errors/ to api/errors 
Using:
        gomvpkg -from github.com/docker/docker/errors
                -to github.com/docker/docker/api/errors
                -vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-16 12:27:13 -04:00
Vincent Demeester
d05e34ca9b Merge pull request #26637 from thaJeztah/fix-cli-prompt 
Use "sudo" for dockerd examples
 2016-09-16 17:44:07 +02:00
Sebastiaan van Stijn
87b174080b Use "sudo" for dockerd examples 
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-16 17:22:58 +02:00
Kenfe-Mickaël Laventure
07b5311147 Merge pull request #26618 from AkihiroSuda/fix-apparmor 
apparmor: prohibit /sys/firmware/** from being accessed
 2016-09-16 07:41:36 -07:00
Antonio Murdaca
03a8b6798d docs: reference: api: clarify pull all tags 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-16 16:35:15 +02:00
Sebastiaan van Stijn
81ba067a1c Merge pull request #26629 from thaJeztah/add-logging-reference-link 
Add link to logging drivers reference
 2016-09-16 15:46:21 +02:00
Sebastiaan van Stijn
7ca02f86de Add link to logging drivers reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-16 15:29:28 +02:00
Vincent Demeester
76ee0e8185 Merge pull request #26541 from LK4D4/update_labels 
project: add area/daemon and area/docs labels
 2016-09-16 08:55:04 +02:00
Vincent Demeester
38d187d3ae Merge pull request #26613 from Microsoft/jjh/14393 
Windows: Turn off builds<14393
 2016-09-16 08:47:00 +02:00
Tõnis Tiigi
4adbd5338d Merge pull request #26583 from aboch/vnd 
Vendoring libnetwork @c8ce8c7
 2016-09-15 20:28:07 -07:00
Tõnis Tiigi
518e000e70 Merge pull request #26607 from aboch/vnd2 
Vendoring boltdb @fff57c100
 2016-09-15 20:24:29 -07:00
Aaron Lehmann
a1fc3852da Merge pull request #26512 from AkihiroSuda/fix-pkg-plugins-racy-test 
[test] fix racy test in pkg/plugins
 2016-09-15 20:11:03 -07:00
Akihiro Suda
693b4ac67a apparmor: prohibit /sys/firmware/** from being accessed 
Some firmware information including SMBIOS and ACPI tables were unexpectedly exposed

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-16 02:21:31 +00:00
Akihiro Suda
4bc908ec89 fix racy test in pkg/plugins 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-16 01:43:35 +00:00
John Howard
cc4e17cbba Windows: Turn off builds<14393 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-15 15:20:16 -07:00
Vincent Demeester
a7c25f9540 Merge pull request #26537 from dnephin/refactor_cli_formatter 
Refactor cli/command/formatter
 2016-09-15 21:52:52 +02:00
Alexander Morozov
b2263c111f Merge pull request #26511 from AkihiroSuda/fix-pkg-archive-racy-test 
[test] fix racy tests in pkg/archive
 2016-09-15 11:10:34 -07:00
Tõnis Tiigi
4c82365cdb Merge pull request #26596 from drakenator/26384-healthcheck-race 
Prevent stdout / stderr race condition in limitedBuffer.
 2016-09-15 10:59:45 -07:00
Alessandro Boch
5cfbdceafe Vendoring boltdb @fff57c100 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-09-15 10:53:48 -07:00