Commit Graph

4848 Commits

Author SHA1 Message Date
ddc0af4e6a Merge pull request #19986 from vishh/expose-root-dir
Expose docker's root directory by default as part of `docker info`.
Upstream-commit: 80187df25708782db20846e63aef7ddb0419c7cf
Component: engine
2016-02-16 12:57:57 -08:00
9315309e4c Expose docker's root directory by default as part of docker info.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
Upstream-commit: 6a3176d4fee3e747ecb6b2d27ab2eb68471f3f8f
Component: engine
2016-02-16 10:40:15 -08:00
1edac85cca Fixing mismatched network name.
Using `my-net` to be consistent with:
https://docs.docker.com/engine/reference/run/

Signed-off-by: Robert Wallis <smilingrob@gmail.com>
Upstream-commit: 8779a4ca62db8b64c5016be20456d5b2e5a407e9
Component: engine
2016-02-15 13:17:05 -08:00
e1a8ad7624 Fix documentation typos
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7da5784b10a9f085af98984e6e69e733e55ddbf5
Component: engine
2016-02-15 15:46:56 +01:00
e92dd3c4a5 Merge pull request #20280 from rhuss/patch-2
Add network mode `none` to list of possible values
Upstream-commit: 7d9532552b433581253898052849524500a21ff5
Component: engine
2016-02-13 14:21:27 +01:00
d4a856da9f Extended explanation of NetworkMode's value
* Add network mode `none` to list of possible values for API version 1.15 - 1.23
* For API version 1.21 - 1.23 add explanation that any other value is taken as a custom network's name

Signed-off-by: Roland Huß <roland@jolokia.org>
Upstream-commit: c80b36c938306ef9cc9ad6865cfc251a694f59aa
Component: engine
2016-02-13 10:00:51 +01:00
949eabdb95 Merge pull request #20285 from moxiegirl/fix-user-guide
Update the userguide to fix user feedback
Upstream-commit: b734d0e8cc69eadaff86884c200d1ce21b37cdb3
Component: engine
2016-02-12 11:07:03 -08:00
5ceee3f64c Update the userguide to fix user feedback
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: bf76b1d686018cebd043aa99152d68fbbe6bb977
Component: engine
2016-02-12 10:08:59 -08:00
ee0d6d6dac Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options
Fix an erratum; s/two/three/
Upstream-commit: 3a3c9538060ebe300cc2272ad28178450b5fdd53
Component: engine
2016-02-12 09:58:48 -08:00
0f9dad85b1 Fix an erratum; s/two/three/
There are three options because the new one was added at 6f863cf.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 8c93958fcb1b1fc838c76b08cc4dde4ce37691bb
Component: engine
2016-02-13 00:14:35 +09:00
c48f1ccfa7 Fix some formatting
* Codified example container names
* Emphasised 'link' vs 'legacy link' (instead of using code markup)
* Add a missing ``` for a code example

Signed-off-by: Roland Huß <roland@jolokia.org>
Upstream-commit: 03b25e024e46a3254012268cda8919a8702b4cbc
Component: engine
2016-02-12 10:34:55 +01:00
697a990701 fix common misspell
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
ea8becc33f update cap-add docs for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1e92e5fdaab833000d6d3a4f6756cb677cb7899e
Component: engine
2016-02-11 13:47:08 -08:00
2d3744313f Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details
Improve usage details on overriding USER command in Docker run refere…
Upstream-commit: d4d0b8a42bcf5e5e1df3565101277dc10843735a
Component: engine
2016-02-11 18:18:26 +01:00
784a3213bb Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b1e5c773b28d27a67d20c0aa0182d40005cfdb50
Component: engine
2016-02-11 08:20:28 -08:00
d0366b3eb4 Improve usage details on overriding USER command in Docker run reference page
Signed-off-by: Sian Lerk Lau <kiawin@gmail.com>
Upstream-commit: bc3e02b9ec4702981bbbd337e4f6ca12bf4eb202
Component: engine
2016-02-12 00:05:32 +08:00
1d794c30ed Docker Remote API documentation update
I was confused for the longest time on how to actually use and make requests against the remote API, so I think that it might help for those getting started with it to know how to actually test it out via curl. I added in parts on how to access the remote API via curl against the default unix socket, and also on how to configure the docker daemon to expose the API on a TCP port as well if desired.

Signed-off-by: Michelle Liu <michelle@michelleliu.io>
Upstream-commit: 2c60a9cba2e0920c9f1e8a193dcf0b6ddad71c5a
Component: engine
2016-02-11 16:28:15 +01:00
b547022504 Merge pull request #20052 from aditirajagopal/19301-overlay-network-unique-hostname
Overlay Network needs Unique Hostname
Upstream-commit: 2cca097ea83aeffb2d2f64ef322bad9a7a79299b
Component: engine
2016-02-11 15:41:54 +01:00
704fe83e00 Merge pull request #20161 from tkopczynski/docs-before-since-filters
docker ps before and since filters documentation
Upstream-commit: 89f94ec03b73cb26963215b81e231f3cc433a38c
Component: engine
2016-02-11 15:32:50 +01:00
7f00edaeb1 Update Dockerfile
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8d673d9471d80bc8032f3280001bcd46f015a84a
Component: engine
2016-02-10 20:40:30 -08:00
3e249a8f81 added better what's next topics to point to new machine docs related to Issue #18282
updated cloud install example per Olivier's comments, added better command examples

updates per @thaJeztah comments

fixed links per @theJeztah comments, renamed cloud.md to overview.md for better URL name

updates per @moxiegirl comments, added alias for renamed file, modified links, changed a title

fixed link errors

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 4e9e95fe8d9ba177ec77727b6fca558a0ba8f01f
Component: engine
2016-02-10 14:19:05 -08:00
e2150f69d4 Before and since filters documentation
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 27fc78abdd2a603479eceded12964356ba971310
Component: engine
2016-02-09 20:37:33 +01:00
5934d3cb06 Fix typo in Docker Toolbox upgrade section
Signed-off-by: Chad Swenson <chadswen@gmail.com>
Upstream-commit: 1435c9ea21d6c76a923c2501abb840e899b5ed1e
Component: engine
2016-02-09 11:36:45 -06:00
d6af17ee30 Merge pull request #20116 from muthu-r/master
Add Horcrux volume plugin to plugins.md
Upstream-commit: f5ed72c931d373bd56069d44ba3b7370acd1f475
Component: engine
2016-02-09 09:59:26 +00:00
6675019158 Make it clear that env vars must be simple
Closes #20169

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d579490b2bd2396c74a48c5c6f41ffc94cd4febd
Component: engine
2016-02-08 18:02:37 -08:00
eca7daefb9 Add Horcrux volume plugin to plugins.md
Signed-off-by: Muthukumar R <muthur@gmail.com>
Upstream-commit: 58427fd8a684f0e4b999d99d6a123b40112d2094
Component: engine
2016-02-08 15:16:56 -08:00
87068955df Update List of Client Library Projects
Resolves: #20110
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 47dbb59e5b5d3472f9391e965131015d83d614a4
Component: engine
2016-02-08 16:16:42 -06:00
342ff0d65d Overlay Network needs Unique Hostname
Resolves: #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 3024604054a588f213b671c7f1ec5eed2c99b78a
Component: engine
2016-02-08 15:14:38 -06:00
1297aa4525 Tweak VM volume mapping paragraph
The wording looked like there was maybe a copy-paste error there, I tried to make it a bit more clear.

Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io>
Upstream-commit: a3c290536a844fd57326a2c2776adbfdc84cc984
Component: engine
2016-02-06 13:35:02 +02:00
feece77ee7 Merge pull request #20049 from kesarion/patch-1
added dockerizer library
Upstream-commit: a70d9957c360bf137d20ff4e65b84465362e0686
Component: engine
2016-02-05 20:52:07 -05:00
05c81423d8 added dockerizer library
Signed-off-by: Kesarion <alexandru.sfirlogea@gmail.com>
Signed-off-by: Alexandru Sfirlogea <alexandru.sfirlogea@gmail.com>
Upstream-commit: 1cceb854a7526eeb5b91be72cedf571af01bc009
Component: engine
2016-02-05 23:49:36 +02:00
2c81aeb705 Fix mention of at sign in docs
The at sign (`@`) was being referred to in the documentation as an
ampersand (`&`).

Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
Upstream-commit: 7f275315edc73027b3d144da439b00fa6565baec
Component: engine
2016-02-05 16:47:57 -05:00
4d6bf1bcd0 Add note that seccomp 2.2.1 or higher is required
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6ab52f9f00968e15e8dcae145dbaea04da394d83
Component: engine
2016-02-05 21:26:03 +01:00
178f5e51dc Add missing debug client mode info in docs.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 4aac8a60b2c969639a96a1c245a18e457d5db4dd
Component: engine
2016-02-05 12:29:54 -05:00
e7e0f7886a Merge pull request #20032 from thaJeztah/fix-systemd-404
Fix incorrect alias for systemd docs
Upstream-commit: e59922a55745894fd2c9a7c3babd923de5c5ca2f
Component: engine
2016-02-05 08:26:15 -08:00
18bade81af Fix incorrect alias for systemd docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 50dba638455954161215bd2b30c924cf61446eee
Component: engine
2016-02-05 16:18:26 +01:00
1f7a83c1d4 Fix typo in Chocolatey
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 4688efc3eddf5aead4bd59ec13e2ca419ef96b28
Component: engine
2016-02-05 16:15:20 +01:00
58fa4d85d1 Fix Header on migration page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0a6e0c43d9442926691cd7a842dcf55fc555c505
Component: engine
2016-02-05 00:35:49 +01:00
e109e016c1 Display internal flag on network inspect
Also adds internal network tests for bridge network

Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: c199506b59f60ac456cb0448ddd86e6dec92bc0a
Component: engine
2016-02-04 15:28:37 +08:00
bace12bd53 Add support details for storage driver
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: feab8b179e20833dd0a65e58934cf24938da6d84
Component: engine
2016-02-04 00:51:02 +00:00
ddb874b792 Merge pull request #19858 from felixge/vboxfs-sendfile-warning
docs: point out known issue with nginx/vboxfs
Upstream-commit: 1ae6da75c8f0c51dc13a632d76f7769a70db36b1
Component: engine
2016-02-03 13:50:34 -08:00
a223b8eb7f Merge pull request #19976 from mbanikazemi/docs-kuryr
Add Kuryr Network Plugin to the docs
Upstream-commit: e17f2e7f048153b0d4f3779f9534f9dcee4b04de
Component: engine
2016-02-03 21:13:48 +01:00
d4d13b919a Merge pull request #19962 from marsmensch/doc_breaking_formatting_fix
Fix formatting in breaking changes doc
Upstream-commit: 9123a24cc8218e5222c2c4f4c9153d6971f3d128
Component: engine
2016-02-03 20:43:52 +01:00
01001e4c62 Add Kuryr Network Plugin to the docs
Signed-off-by: Mohammad Banikazemi <mb@us.ibm.com>
Upstream-commit: 4904210d9cd4381363a28ed40ee5cb525948c5f7
Component: engine
2016-02-03 14:21:54 -05:00
0abee8411c Fix formatting in breaking changes doc
Signed-off-by: Florian Maier <contact@marsmenschen.com>
Upstream-commit: f0df677913ce9bc6da5253dcca62690917923a3c
Component: engine
2016-02-03 19:22:14 +01:00
71738b2706 Merge pull request #18966 from mariusGundersen/machine-readable-state
Expose the machine readable state of a container when listing containers
Upstream-commit: 98c4f0bbc3580df2b1dabde513e9aa97362fa3cc
Component: engine
2016-02-03 16:41:45 +01:00
c22fe80e6f docs: point out known issue with nginx/vboxfs
see https://github.com/docker/docker/issues/18666

Signed-off-by: Felix Geisendörfer <felix@debuggable.com>
Upstream-commit: 9afdd436cdb0d13eff8f34026a7f7e4d40cfda53
Component: engine
2016-02-03 15:02:48 +01:00
90f951a226 Merge pull request #19940 from bfirsh/add-1.10-migration-docs
Add 1.10 migration docs
Upstream-commit: 052e5f222e5c422b31160255b499a298b9b89898
Component: engine
2016-02-03 08:52:17 +01:00
856f16871a Fix typo
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 2fd35de274fa25d5031756eb5fdf3f3240bc4d9d
Component: engine
2016-02-02 19:07:58 -08:00
51e3bc5e37 Update networkingcontainers.md
updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead.

Signed-off-by: Troy Denton <Troy.Denton@younessleeptechnologies.com>
Upstream-commit: 0e147547660c830e5ea33a0b9a0281e64256efab
Component: engine
2016-02-02 19:05:55 -08:00