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
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
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
Sven Dowideit
a1ecd8e68c
Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link
...
Fixed link to contribution page in docs/README.md.
2015-11-06 09:57:07 +10:00
Solomon Hykes
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
David Calavera
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-05 17:09:57 -05:00
Brian Goff
9465d6ee6a
Merge pull request #17534 from Microsoft/10662-filterhyperv
...
Windows: Add isolation to ps filter
2015-11-05 15:55:47 -05:00
John Howard
9c5814171c
Windows: Add isolation to ps filter
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-05 10:18:24 -08:00
Anton Polonskiy
3f331eaa40
fix typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
2015-11-05 18:33:16 +02:00
Christopher Jones
f48f850a24
Updated link to https.
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-11-05 09:20:20 -06:00
Jeroen Jacobs
75602d4930
Fixes typo in docs/userguide/dockervolumes.md
...
Signed-off-by: Jeroen Jacobs <git@jeroenj.be >
2015-11-05 16:08:11 +01:00
Nathan LeClaire
6326e6732d
Revise commands in Compose section of multi-host quickstart
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-04 17:44:01 -08:00
Sebastiaan van Stijn
1ef3b1f857
Merge pull request #17694 from hrldcpr/patch-1
...
fix documentation inconsistency for volume create
2015-11-05 01:16:09 +01:00
Sebastiaan van Stijn
236913f4e8
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
2015-11-05 00:50:08 +01:00
Alex Chan
40dc0c4861
Fix typo in dockervolumes.md
...
Signed-off-by: Alex Chan <alex@alexwlchan.net >
2015-11-04 22:13:35 +00:00
Sally O'Malley
41de7a18d8
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-11-04 15:18:50 -05:00
Mary Anthony
90e16ab8f9
Fixing BTRFS > Btrfs
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-04 11:23:16 -08:00
Sebastiaan van Stijn
8e2b20580b
Docs: add "Linux kernel extra" to manual install
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-11-04 19:49:47 +01:00
harold cooper
f67da614e9
fix documentation inconsistency for volume create
...
the example command uses `/world` but the description refers to `/src`
Signed-off-by: Harold Cooper <hrldcpr@gmail.com >
2015-11-04 13:22:53 -05:00
Christopher Jones
836fa1c1e5
Fixed link to contribution page in docs/README.md.
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-11-04 11:24:03 -06:00
Sebastiaan van Stijn
67630bef47
Merge pull request #17649 from rsmoorthy/rsmoorthy-patch-1
...
volume plugin doc update
2015-11-03 23:33:20 +01:00
Madhu Venugopal
39dfc536d4
Updating networking docs with technical information
...
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-03 08:42:40 -08:00
Sebastiaan van Stijn
43ae13742d
Merge pull request #17650 from thaJeztah/fix-api-network-output
...
docs: update remote API responses and minor fixes
2015-11-03 16:09:01 +01:00
Sebastiaan van Stijn
d3b2e7dcf4
Merge pull request #17652 from moxiegirl/nigel-credits
...
Nigel acknowledgement
2015-11-03 15:35:53 +01:00
Sebastiaan van Stijn
286fe69d53
docs: update remote API responses and minor fixes
...
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
https://github.com/docker/docker/pull/17538
Update network endpoint responses, with updated response
introduced in;
https://github.com/docker/docker/pull/17536
Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);
https://github.com/docker/docker/pull/17085
https://github.com/docker/docker/pull/17127
https://github.com/docker/docker/pull/13707
Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-11-03 15:24:31 +01:00
Mary Anthony
7b978cc378
Nigel acknowledgement
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-03 05:52:33 -08:00
Mary Anthony
0f1083c8da
Fixing ZooKeeper and some other nits Nathan found
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-03 05:34:54 -08:00
rsmoorthy
4d9b8bae25
multiple mount/unmount req with same volume name
...
Updating docs to handle mount/unmount requests with same volume name. Issue #17585
Signed-off-by: Moorthy RS <rsmoorthy@gmail.com >
2015-11-03 16:33:20 +05:30
Gou Rao
0385b9b65d
Update plugins.md
...
Add OpenStorage to Docker plugin list.
Signed-off-by: Gou Rao <gou@portworx.com >
2015-11-02 22:23:13 -08:00
Mary Anthony
950fbf99b1
Add special memory management file
...
updating after assignment for Nigel
Adding in some notes from Nigel work
Updating with the storage driver content Nigel added
Updating with Nigel's polishing tech
Adding in Nigel graphics
First pass of aufs material
Capturing Nigel's latest
Comments back to Nigel on devicemapper
Incorporating Nigel's comments v3
Converting images for dm
Entering comments into aufs page
Adding the btfs storage driver
Moving to userguide
Adding in two new driver articles from Nigel
Optimized images
Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-02 21:40:18 -08:00