centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-28 06:49:00 +07:00
Code Issues Packages Projects Releases Wiki Activity
17,950 Commits 54 Branches 28 Tags
6caaa8a63544c052d757aecee93d3488b7b3d9e2
Commit Graph

4056 Commits

Author SHA1 Message Date
Alexander Morozov
6caaa8a635 Merge pull request #15023 from hqhq/hq_add_status_in_inspect 
Add status string to State field for inspect
 2015-08-28 08:27:36 -07:00
Sebastiaan van Stijn
fdc73cc3fc Merge pull request #15778 from dharmit/13595-update-docs-process-interaction-container 
Added note about process interaction with container in detached mode
 2015-08-27 22:39:20 +02:00
moxiegirl
04b0fb6314 Merge pull request #15822 from vdemeester/docs-update-filtering-ps-and-images 
Update filtering chapters on ps/images references
 2015-08-27 10:39:20 -07:00
Vincent Demeester
61de442c49 Update filtering chapters on ps/images references 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-27 08:47:03 +02:00
Dharmit Shah
9f8891a855 Added note about process interaction with container in detached mode 
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

Added note about process interaction with container in detached mode

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
 2015-08-27 09:39:34 +05:30
Sebastiaan van Stijn
44ea7e91fb Merge pull request #15760 from mikebrow/9235-improve-documentation 
Improvement to userguide/dockerrepos/ documentation
 2015-08-27 01:21:12 +02:00
Mike Brown
5caccd27cd improvement to documentation 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2015-08-26 16:49:31 -05:00
moxiegirl
5e8038d0b0 Merge pull request #15773 from charleswhchan/patch-3 
Fix #14572: Improve explaination for using `RUN` command inside Docke…
 2015-08-26 14:19:44 -07:00
Alexander Morozov
7a74422724 Merge pull request #15826 from Microsoft/start-from-one 
Builder counts from 1
 2015-08-26 13:59:38 -07:00
moxiegirl
ea65c38ac0 Merge pull request #15843 from MHBauer/version-order 
reweight api doc for v1.21 to correct the order.
 2015-08-26 13:51:06 -07:00
Morgan Bauer
31a52a31c6 reweight api doc for v1.21 to correct the order. 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-08-26 13:40:37 -07:00
Brian Goff
b3b7eb2723 Add volume API/CLI 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-26 13:37:52 -04:00
John Howard
17d6c6c7e5 Builder counts from 1 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-26 10:05:04 -07:00
David Calavera
b857dadb33 Merge pull request #15711 from monitorjbl/import-commit-message 
adding message option to the import subcommand
 2015-08-26 11:42:10 +02:00
Charles Chan
b6621a1b6c Fix #14572: Improve explaination for usng RUN and apt-get inside Dockerfil. 
Based on example provided by @thaJeztah and @moxiegirl:
  https://github.com/docker/docker/pull/15773

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-08-25 21:58:20 -07:00
Sven Dowideit
8720f71b52 Merge pull request #15836 from rsmitty/issue-15835 
Resolves link to introduction to Docker
 2015-08-26 12:06:29 +10:00
Sven Dowideit
3bc375c6e4 Merge pull request #15831 from yasker/master 
Update plugins.md
 2015-08-26 12:05:35 +10:00
Spencer Smith
90be489f40 Updates link to the understanding-docker section 
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
 2015-08-25 14:12:29 -07:00
Spencer Smith
9a71dd2b90 Resolves link to introduction to Docker 
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
 2015-08-25 13:54:39 -07:00
Sheng Yang
5f156d8c25 Update plugins.md 
Add Convoy to Docker plugin list.

Signed-off-by: Sheng Yang <sheng.yang@rancher.com>
 2015-08-25 12:01:31 -07:00
James Turnbull
7dbb5fafcd Merge pull request #15824 from Microsoft/10662-moredocs 
Windows: Minor doc clarification
 2015-08-25 13:30:54 -04:00
John Howard
759ed647fb Windows: Minor doc clarification 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-25 09:36:51 -07:00
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