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
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
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
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
Aaron Lehmann
2a87856599
Merge pull request #26589 from allencloud/correct-nits
...
correct some nits in comments and test
2016-09-15 10:49:47 -07:00
Sebastiaan van Stijn
c2ec745490
Merge pull request #26605 from thaJeztah/sync-push-docs
...
Synchronize push reference with man page
2016-09-15 19:18:23 +02:00
Sebastiaan van Stijn
dddea689ab
Synchronize push reference with man page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
51a981fd5f
Merge pull request #26581 from yongtang/09142016-docs-getstarted-step-four
...
Fix a couple of issues in Get Started docs
2016-09-15 16:51:49 +02:00
Sebastiaan van Stijn
69af9b2a92
Merge pull request #26599 from thaJeztah/docs-restore-missing-format-example
...
Restore missing "format" example
2016-09-15 16:46:00 +02:00
Sebastiaan van Stijn
edbb8fb86d
Restore missing "format" example
...
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-15 16:09:24 +02:00
Stephen Drake
c3319445aa
Prevent stdout / stderr race condition in limitedBuffer.
...
Signed-off-by: Stephen Drake <stephen@xenolith.net>
2016-09-15 13:31:11 +02:00
Alexander Morozov
b248de7e33
Merge pull request #26584 from aaronlehmann/rate-limit-progress-bar
...
progress: Rate limit progress bar output
2016-09-14 22:15:42 -07:00
allencloud
9279a93f6d
correct some nits in comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-15 12:17:58 +08:00
Aaron Lehmann
f8eab6fea8
progress: Rate limit progress bar output
...
ProgressReader outputs progress information every 500 KB. This could be
excessive if something is being transfered at a fast rate. Rate-limit
progress output to 10 per second.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-09-14 17:23:16 -07:00
John Howard
39f5d97cde
Merge pull request #26553 from darrenstahlmsft/FixWildcard
...
Windows: Fix wildcard expansion after slash in filename
2016-09-14 16:56:35 -07:00
Sven Dowideit
37869b237c
Merge pull request #25774 from ddgenome/cmd-entrypoint-table
...
Update ENTRYPOINT/CMD table to agree with docs
2016-09-15 09:35:13 +10:00
Alessandro Boch
161c121425
Vendoring libnetwork @c8ce8c7
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-14 14:46:05 -07:00
Anusha Ragunathan
e482d4ee71
Merge pull request #26575 from anusha-ragunathan/update_plugin_docs
...
Update plugin install docs with registry specifics.
2016-09-14 14:43:41 -07:00
Sebastiaan van Stijn
cfa868f098
Merge pull request #26582 from thaJeztah/add-full-image-link
...
Add direct link to event chart image
2016-09-14 23:24:34 +02:00
Sebastiaan van Stijn
86de72fef2
Add direct link to event chart image
...
This adds a direct link to the event chart image
so that the full-resolution image can be "zoomed"
in to.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-14 23:16:32 +02:00
Tõnis Tiigi
1573ea5974
Merge pull request #26552 from darrenstahlmsft/EnableBuildTests
...
Windows: Enable more build tests
2016-09-14 14:07:19 -07:00
Tõnis Tiigi
094c029207
Merge pull request #26562 from loa/master
...
Add errexit to mkimage-yum.sh
2016-09-14 14:05:52 -07:00
Vincent Demeester
11ce938ba8
Merge pull request #26570 from thaJeztah/remove-frugalware-installation-docs
...
Remove Frugalware installation docs
2016-09-14 22:45:08 +02:00
Yong Tang
1cd06fdd1a
Fix a couple of issues in Get Started docs
...
This fix fixes a couple of issues in Get Started docs' Step Four:
1. `Sending build context to Docker daemon 158.8 MB` should be
`Sending build context to Docker daemon 2.048 kB` as there is only
one Dockerfile for context.
2. There are only 3 steps altogether in stead of 4 steps as
`RUN apt-get -y update && apt-get install -y fortunes` is one step.
So `Step 3 : RUN apt-get install -y fortunes` should be removed and
`Step 4 : CMD /usr/games/fortune -a | cowsay` should be changed to
`Step 3 : CMD /usr/games/fortune -a | cowsay`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-14 13:40:15 -07:00
Brian Goff
f8d6dedb6a
Merge pull request #26574 from cpuguy83/fix_improper_use_in_test
...
Fix improper use of `--rm` in test case
2016-09-14 15:28:40 -04:00