David Calavera
7296c845b7
Fix json examples in the api reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-25 10:55:12 -04:00
Ed Costello
cefb72080d
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
2015-08-24 23:02:44 -04:00
Taylor Jones
936b2c6afe
adding message option to the import subcommand
...
Signed-off-by: Taylor Jones <monitorjbl@gmail.com >
2015-08-25 02:55:04 +00:00
Casey Bisson
831747d59e
Closes PR #14503 with this carry
...
- Refer to Joyent's blogs and docs rather than following from our end
- All of this information exists on Joyent's site
Updating with thaJeztah's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-24 13:21:27 -07:00
Brian Goff
fd8b25c802
Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
...
Add always-unless-stopped restart policy
2015-08-24 13:48:56 -04:00
Álex González
62ce5b6929
Revert "Fix broken links at plugins documentation"
...
This reverts commit 354147df01 .
Signed-off-by: Álex González <agonzalezro@gmail.com >
2015-08-24 11:48:59 +01:00
Alexandre González
354147df01
Fix broken links at plugins documentation
...
Signed-off-by: Álex González <agonzalezro@gmail.com >
2015-08-24 10:47:56 +01:00
Sebastiaan van Stijn
7ead74d903
Merge pull request #15774 from charleswhchan/patch-4
...
Revise Mac Docker instructions
2015-08-23 10:26:58 +02:00
Charles Chan
9572edc34a
Revise Mac Docker instructions
...
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-22 08:00:48 -07:00
Charles Chan
3faba5fbe2
Revise Windows Docker instructions
...
* Fix Windows 7 (not 7.1 ;p)
* Clarify virtualization technology section, add link to wiki
* Fix heading level for various ways of starting Docker container
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-22 07:26:26 -07:00
Sebastiaan van Stijn
9415db7e95
Merge pull request #15742 from Microsoft/addazure
...
Add Microsoft Azure
2015-08-21 23:41:36 +02:00
Jessie Frazelle
9bd8a9b66b
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
2015-08-21 14:34:27 -07:00
Jessica Frazelle
ee1304a35e
fedora 20 is EOL remove from rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-21 11:01:18 -07:00
Sebastiaan van Stijn
5ceff3f191
Merge pull request #15718 from ZJU-SEL/rm-volume-action
...
specify `docker run --rm` action when it comes to volume
2015-08-21 08:50:18 +02:00
John Howard
98f60aef13
Add Microsoft Azure
...
Signed-off-by: John Howard <john.howard@microsoft.com >
2015-08-20 18:35:21 -07:00
He Simei
76a559ccb2
specify the docker run --rm action
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-08-21 08:52:06 +08:00
Mary Anthony
15c24db9a5
Examples index has broken links
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-20 13:40:03 -07:00
evalle
3c61ede074
Fix a windows doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-08-20 14:14:48 +02:00
Aanand Prasad
23d3e4bb03
Fix Compose 1.2 changelog link
...
Hardcode the release tag, so that:
- it goes straight to the changes for 1.2, not whatever the current
version is
- it still works now that we've renamed CHANGES.md to CHANGELOG.md
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-08-20 11:09:10 +01:00
Sebastiaan van Stijn
35cbcc2fc1
Add gists provided by Mary
...
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-20 00:30:39 +02:00
Spencer Brown
6dd84ba2ab
run.md: --expose does NOT override Dockerfile EXPOSE
...
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.
This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.
Signed-off-by: Spencer Brown <spencer@spencerbrown.org >
2015-08-19 23:57:35 +02:00
moxiegirl
286afb9a77
Merge pull request #15682 from MHBauer/cliorder
...
add weight to daemon page so it renders in order
2015-08-19 14:24:51 -07:00
Morgan Bauer
2a84157352
add weight to daemon page so it renders in order
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-08-19 10:26:19 -07:00
Sebastiaan van Stijn
f848f34da2
Merge pull request #15694 from liubin/fixtypo
...
add missing instruction
2015-08-19 19:05:41 +02:00
Qiang Huang
b6f1b4ad35
Add support for kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-19 23:56:55 +08:00
Sebastiaan van Stijn
7ec7173b76
Merge pull request #15482 from hqhq/hq_fix_run_doc
...
Add format description in run doc
2015-08-19 17:13:00 +02:00
Sebastiaan van Stijn
59e49e1db0
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
2015-08-19 17:04:23 +02:00
bin liu
1988064ef2
add missing instruction
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-08-19 18:43:19 +08:00
Philipp Wahala
fbc0ea32e8
Small fix in dev env docs
...
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com >
2015-08-19 10:53:55 +02:00
Qiang Huang
2a468ed7e4
Add format description in run doc
...
And only set false to --oom-kill-disable, we just need the default
value to show.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-19 10:11:08 +08:00
moxiegirl
aacb47d628
Merge pull request #15671 from tonistiigi/fix-volume-userguide
...
Update volumes userguide
2015-08-18 18:57:24 -07:00
moxiegirl
5fccbd1243
Merge pull request #15676 from thaJeztah/fix-anchor-link
...
docs: fix anchor link on Ubuntu installation page Merging for @thaJeztah ....da ddadad dadada 🎼
2015-08-18 18:55:56 -07:00
Morgan Bauer
b143c05d64
remove references to 'source repository'
...
- rewrite intro to Dockerfile reference usage section to remove
references to 'source repository'
- Closes #14714
- Fixes: #8648
- Updating with Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-18 15:50:42 -07:00
Sebastiaan van Stijn
5dd28c1f9d
docs: fix anchor link on Ubuntu installation page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-18 23:41:00 +02:00
Mary Anthony
85c2c77188
Updating hashcode links to commands
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-18 12:25:59 -07:00
Tonis Tiigi
cc2aab7816
Update volumes userguide
...
Fixes #15644
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-18 12:17:45 -07:00
Tonis Tiigi
10305dc5e8
Add unless-stopped restart policy
...
Fixes #11008
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-18 11:39:06 -07:00
moxiegirl
bba2551847
Merge pull request #15510 from kblin/issue-14795
...
reference/run: Clarify the use of numeric UIDs
2015-08-18 09:43:16 -07:00
moxiegirl
7ae6a505f2
Merge pull request #15337 from phemmer/doc-builder-volume
...
add documentation clarifying behavior of VOLUME instruction
2015-08-18 09:42:00 -07:00
Sebastiaan van Stijn
d7ac3fa863
Merge pull request #15605 from dharmit/15530-remove-the-terms-folder
...
Fixing docs to remove references to links under terms/
2015-08-18 18:27:28 +02:00
Sven Dowideit
30cde97e5c
use the Docker Hub as the product name
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-08-18 21:13:57 +10:00
Kai Blin
ba29d31c9c
reference/run: Some editorial changes
...
Based on the suggestions from @moxiegirl, some changes to make the wording more clear.
Signed-off-by: Kai Blin <kai@samba.org >
2015-08-18 08:56:56 +02:00
moxiegirl
66112a7ae5
Merge pull request #15613 from mgrauer/update_docs_installation_mac_docker_machine_name
...
Update dev machine name to default in mac installation docs
2015-08-17 19:05:34 -07:00
moxiegirl
5ab6883b92
Merge pull request #15430 from charleswhchan/patch-2
...
Cleanup "Working with containers" page.
2015-08-17 17:46:05 -07:00
Sebastiaan van Stijn
bba762b192
Merge pull request #15237 from charleswhchan/patch-3
...
Reformat /containers/(id)/resize to make it consistent with other sections.
2015-08-16 10:59:16 +02:00
Charles Chan
6cd2d89469
Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-15 19:47:01 -07:00
Sebastiaan van Stijn
e1f3a5ad0a
Merge pull request #14113 from dit4c/10348-exec-privileged
...
Remerge of `docker exec --privileged` with better tests
2015-08-16 00:20:41 +02:00
Michael Grauer
f26045a534
Update dev machine name to default in mac installation docs
...
Signed-off-by: Michael Grauer <michael.grauer@kitware.com >
2015-08-15 15:56:41 -04:00
Charles Chan
2fcae333e8
Cleanup "Working with containers" page.
...
* Cleanup introduction
* Update output of `docker version`
* Cleanup explaination of `docker inspect`
* Change 'deleting' to 'removing' for consistency
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-15 08:44:56 -07:00
Dharmit Shah
0a925d07a8
Fixing docs to remove references to links under terms/
...
Removed terms/ directory
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
2015-08-15 13:09:29 +05:30