Mary Anthony
0a31647780
Fixing issue noted by user
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-13 10:28:51 -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
Mike Brown
430d8ff611
modifying docker --since and --until to support nanoseconds and time zones
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
2015-11-13 09:56:15 -06: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
Justin Cormack
4fca870212
Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com >
2015-11-10 20:44:18 +00:00
Sebastiaan van Stijn
d4c4557b1a
Merge pull request #17613 from Microsoft/10662-isolationexecopt
...
Windows: Add default isolation exec driver option
2015-11-10 19:55:46 +00:00
John Howard
a429ad1e35
Windows: Add default isolation exec driver option
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-10 11:39:05 -08:00
Sebastiaan van Stijn
d27e802bc5
Merge pull request #17641 from libopenstorage/plugins-md
...
Add OpenStorage to plugins.md
2015-11-10 19:21:43 +00:00
Sebastiaan van Stijn
2f1865ae0e
Merge pull request #17778 from tophj-ibm/link-fixes
...
Fixed broken links in docker_remote_api
2015-11-10 19:17:17 +00:00
Sebastiaan van Stijn
2aa9d85c92
Merge pull request #17821 from HackToday/17820-fix-volume-doc
...
Fixing wrong volume doc format
2015-11-10 19:03:09 +00:00
gissehel
e036bf6c07
explicit way to express that those are different choice and not just one big file to create
...
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org >
2015-11-10 11:41:19 +01:00
Sebastiaan van Stijn
c97ac4daf0
Merge pull request #17279 from someara/articles-chef
...
Documenation update - articles/chef
2015-11-10 00:56:41 +00:00
Anthony Dahanne
4efe0def0a
Implicitly use swarm:latest so that master and agent use the same version of swarm
...
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com >
2015-11-09 15:05:17 -08:00
Kai Qiang Wu(Kennan)
a874ce08f3
Fixing wrong volume doc format
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2015-11-09 02:17:50 -06:00
Lei Jitang
3c4dab51d3
Remove DOCKER_EXECDRIVER env
...
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.
Signed-off-by: Lei Jitang <leijiang@huawei.com >
2015-11-09 09:17:32 +08:00
Sebastiaan van Stijn
fdc8cce070
Merge pull request #16742 from runcom/10772-docker-stats-all
...
Allow docker stats without arguments
2015-11-07 19:41:03 +00:00
Antonio Murdaca
ae818a820f
Allow docker stats without arguments
...
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-11-07 17:03:33 +01:00
Christopher Jones
93939c3f9f
Fixed broken links in docker_remote_api
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-11-06 16:12:51 -06:00
moxiegirl
8aa8d51610
Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
...
Revise commands in Compose section of multi-host quickstart
2015-11-06 13:04:43 -08:00
Gou Rao
1a8cd193f9
Update plugins.md
...
Signed-off-by: Gou Rao <gou@portworx.com >
2015-11-05 21:16:26 -08:00
Sebastiaan van Stijn
5e2f31e992
Merge pull request #17696 from thaJeztah/update-ubuntu-install
...
Docs: add "Linux kernel extra" to manual install
2015-11-06 02:04:05 +01:00
Sebastiaan van Stijn
7a2669f596
Merge pull request #17610 from thaJeztah/add-env-example
...
Add examples for ENV vars in API
2015-11-06 01:19:58 +01:00