Commit graph

4402 commits

Author SHA1 Message Date
moxiegirl
c83373112c Merge pull request #17986 from bogdangrigg/master
Fix small typos in documentation files
2015-11-17 16:45:38 -08:00
moxiegirl
2ee56ce1e1 Merge pull request #18011 from lrkwz/patch-1
Update ubuntulinux.md
2015-11-17 16:44:33 -08:00
Alexander Morozov
662b9623c1 Merge pull request #17866 from shekhargulati/patch-1
added rx-docker-client library
2015-11-17 16:15:15 -08:00
Michael Crosby
104dab87ea Merge pull request #17478 from vdemeester/pr-13921
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
2015-11-17 15:44:57 -08:00
Jess Frazelle
aeccd45e5b Merge pull request #17419 from nathwill/cent-install-docs
fix yum install docs
2015-11-17 20:57:15 +01:00
Alexander Morozov
f18d5da6a7 Merge pull request #17300 from kunalkushwaha/plugin-info
Patch for Plugin drivers in docker info
2015-11-17 10:46:29 -08:00
David Calavera
d507acb175 Merge pull request #17724 from runcom/remove-depreciated-cli-flags
Remove depreciated cli flags
2015-11-17 16:40:06 +01:00
Lee, Meng-Han
ea04764059 Fix Markdown syntax error in aufs-driver
Signed-off-by: dm4 <dm4@skymizer.com>
2015-11-17 17:38:36 +08:00
Alexander Morozov
a3065fa48f Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
Allow configurable metadata for Splunk log driver
2015-11-16 10:11:27 -08:00
moxiegirl
4b706195d2 Merge pull request #17515 from azurezk/fixdoc
fix doc of volume name conflict
2015-11-16 09:15:50 -08:00
Andre Granovsky
be2152116c docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com>
Adjusted as per comment.
Rebase and squash by moxigirl

Signed-off-by: Andre Granovsky <robotciti@live.com>
2015-11-16 08:24:26 -08:00
Luca Orlandi
fe123edb08 Update ubuntulinux.md
Remove '*' for purge

Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com>
2015-11-16 13:29:36 +01:00
Kunal Kushwaha
aa7fd884e6 Supported added for reterving Plugin list for Network and Volume.
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-16 15:28:09 +09:00
Zhang Kun
82ba25bea9 fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-11-15 23:32:40 +08:00
Antonio Murdaca
7929888214 Remove deprecated cli flags
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-15 10:40:01 +01:00
Luca-Bogdan Grigorescu
d1e72baa15 Fix small typos in documentation files
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com>
2015-11-15 00:53:27 +02:00
Vincent Demeester
49779b674a Add pkg/parsers/architecture and pkg/platform
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-14 23:03:02 +01:00
Olle Jonsson
4e8fcd4002 /info: Add keys Architecture, OSType
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
2015-11-14 22:21:45 +01:00
Alexander Morozov
f5e318a17b Merge pull request #17090 from duglin/dockerignoreWildcards
Support multi-dir wildcards in .dockerignore
2015-11-13 14:29:34 -08:00
Doug Davis
eddb14a44e Support multi-dir wildcards in .dockerignore
Closes #13113

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-13 13:44:07 -08:00
moxiegirl
f49fb07086 Merge pull request #17961 from pidster/add-weave-network-plugin
Add Weave Network Plugin to docs/extend/plugins.md
2015-11-13 10:12:58 -08:00
Alexander Morozov
cccf674943 Merge pull request #16873 from coolljt0725/expand_docker_info
Add more cgroup config to docker info
2015-11-13 09:37:06 -08:00
pidster
f57073c72b Add Weave Network Plugin to docs/extend/plugins.md
Signed-off-by: pidster <pid@pidster.com>
2015-11-13 10:09:22 +00:00
Sebastiaan van Stijn
02bc514fb8 Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs
docs: update supported drivers for docker logs
2015-11-13 07:37:47 +01:00
Shekhar Gulati
4e4a68415c added rx-docker-client library
Signed-off-by: Shekhar Gulati <shekhargulati84@gmail.com>
2015-11-13 08:23:57 +05:30
moxiegirl
c5a10b1d27 Merge pull request #17941 from s093294/patch-1
updated instruction to correct file path
2015-11-12 16:34:18 -08:00
moxiegirl
c8399630ca Merge pull request #17942 from thaJeztah/speedy-boarding
Docs: improve caching for make docs
2015-11-12 16:33:41 -08:00
Vincent Demeester
812a1c149a Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
Paolo G. Giarrusso
6b02876362 Replace now broken link with a "permalink"
Fix #17927.

Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
2015-11-12 19:17:29 +01:00
Sebastiaan van Stijn
06a4e5f981 Docs: improve caching for make docs
Use caching for all other repositories, instead
of doing a svn checkout each time.

This may result in showing  outdated docs
for other repositories, but --no-cache can be
used if the latest docs are needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 16:30:40 +01:00
Poul Kjeldager Sørensen
5935867213 updated instruction to correct file path
Signed-off-by: Poul Kjeldager Sørensen <pks@ascend.xyz>
Signed-off-by: Poul Kjeldager Sørensen <pks@s-innovations.net>
2015-11-12 16:15:29 +01:00
Denis Gladkikh
26855c7801 Allow configurable metadata for Splunk log driver
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-11-12 06:36:51 -08:00
Sven Dowideit
9c6e3396ef Merge pull request #17631 from sallyom/docker-login-non-root
clarify docker login
2015-11-12 22:39:35 +10:00
Sally O'Malley
f9657819cd docker-login man/doc add security info
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-12 07:25:35 -05:00
Sebastiaan van Stijn
f2705fa6ed docs: fix link to "run reference"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 12:38:46 +01:00
moxiegirl
40ed821d2e Merge pull request #17388 from vikstrous/notary_docs
more notary documentation
2015-11-11 20:07:55 -08:00
Viktor Stanchev
e869e8aa3d more notary documentation
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
2015-11-11 19:56:10 -08:00
Sebastiaan van Stijn
a4b2de674c Fix find and replace typo in dockerimages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 00:52:31 +01:00
Anusha Ragunathan
2b766a455c Include xfsprogs in build environment.
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2015-11-11 14:42:08 -08:00
moxiegirl
6c5395360f Merge pull request #17883 from dave-tucker/bug/17709
Add required ports for Overlay to docs
2015-11-11 13:10:22 -08:00
Sebastiaan van Stijn
e49e6b7bfd Merge pull request #17915 from moxiegirl/17764-fix
Adding in Contiv plugins
2015-11-11 20:56:57 +00:00
Mary Anthony
40fc3a8bcf Adding in Contiv plugins
Fixes #17764
Also fixed problem where the menu ordering was off
Fix the wrap

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-11 12:56:07 -08:00
David Currie
f16dceb632 Updates to Get started with multi-host networking
Updates primarily to expand usage of Swarm cluster and make Compose
section more verbose plus other minor corrections.

Signed-off-by: David Currie <david_currie@uk.ibm.com>
2015-11-11 20:31:18 +00:00
Sebastiaan van Stijn
3e9543fc61 docs: update supported drivers for docker logs
The journald driver also supports docker logs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-11 20:47:42 +01:00
Dave Tucker
44a527d877 Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
2015-11-11 18:04:07 +00:00
Ma Shimiao
0fbfa1449d Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-11-11 23:06:36 +08:00
Sebastiaan van Stijn
9498e9b732 Merge pull request #17800 from Starefossen/patch-1
Utillize build cache for Node.js web app example
2015-11-11 09:56:40 +00:00
John Howard
2d87dd5c6e Removing made up word
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-10 14:37:23 -08:00
Hans Kristian Flaatten
641c739fc1 Utillize build cache for Node.js web app example
Signed-off-by: Hans Kristian Flaatten <hans@starefossen.com>
2015-11-10 23:05:32 +01:00
Sebastiaan van Stijn
3d23fdaf97 Merge pull request #17754 from justincormack/gpg-server
Add an alternate gpg server to the documentation for Ubuntu and Debian.
2015-11-10 21:08:56 +00:00