centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-02 17:28:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,377 Commits 55 Branches 28 Tags
da61228501acf24e651e167efb7b3c25c6bf5548
Commit Graph

3328 Commits

Author SHA1 Message Date
moxiegirl
da61228501 Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow 
Explain advanced contribution workflow more
 2015-04-03 06:41:49 -07:00
Tibor Vass
9707286a5c Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
 2015-04-02 08:25:49 -04:00
Alexander Morozov
81f9b72c64 Bump API version and docs to v1.19 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-01 13:40:56 -07:00
Doug Davis
39908fc6d9 Add support for more advanced ${xxx:...} syntax 
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-01 08:11:15 -07:00
moxiegirl
39711c8b26 Merge pull request #11969 from powo/patch-1 
Update networking.md (IPv6 wrong prefix)
 2015-04-01 07:45:31 -07:00
moxiegirl
dc564d8cf8 Merge pull request #11972 from thaJeztah/docs-fix-heading-level 
docs: fix heading level of logging drivers
 2015-04-01 07:34:45 -07:00
moxiegirl
f73109b883 Merge pull request #11982 from sunyuan3/docker-run 
Fix typoes in docker-run.1.md
 2015-04-01 07:32:06 -07:00
Yuan Sun
a44451d40e Fix typoes in docker-run.1.md 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-01 17:09:01 +08:00
Sebastiaan van Stijn
f855d5dde7 Fix heading level of logging drivers 
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-04-01 01:07:22 +02:00
Wolfgang Powisch
6a47c70d60 Update networking.md 
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at>
 2015-04-01 00:44:41 +02:00
Ankush Agarwal
8caf8f0a79 Use different host and container port for clarity 
Fixes #11953

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-31 11:59:58 -07:00
Phil Estes
97f621bcd8 Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table 
Fix-11752 add capabilities list information table.
 2015-03-30 23:18:30 -04:00
Harry Zhang
bf15f675b9 Revison the some columns to make table clearer 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
 2015-03-31 02:41:49 +00:00
Michael Crosby
14fed352cb Merge pull request #11799 from dqminh/aufs-dirperm1 
aufs: apply dirperm1 by default if supported
 2015-03-30 11:36:02 -07:00
Ankush Agarwal
ddd27616e0 Explain --net=host option usage 
Fixes #11630

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-30 10:28:44 -07:00
moxiegirl
41e47bbf34 Merge pull request #11678 from botchagalupe/docker-11465 
Closes #11465 - Add additional doc for local registries on pull command
 2015-03-29 14:10:20 -07:00
moxiegirl
4edf8e1e53 Merge pull request #11798 from amylindburg/11792-fix-typo 
Fixing typo in cd instruction
 2015-03-29 14:01:35 -07:00
moxiegirl
3bf9869234 Merge pull request #11897 from ankushagarwal/glossary 
Add Glossary to documentation
 2015-03-29 13:49:22 -07:00
moxiegirl
8b3d8f21a0 Merge pull request #11885 from bobrik/fix-formatting 
Fixed code formatting on docs.docker.com
 2015-03-29 13:21:26 -07:00
moxiegirl
3ff71c24c1 Merge pull request #11875 from ahmetalpbalkan/docs/boot2docker-windows 
Update Documentation for Windows Installation
 2015-03-29 13:18:00 -07:00
moxiegirl
584df44d42 Merge pull request #11870 from dekobon/master 
11558 - Documentation fixes and improvements for Riak Dockerfile
 2015-03-29 12:42:54 -07:00
Ankush Agarwal
567f723721 Add Glossary to documentation 
Closes #11057

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-29 12:24:54 -07:00
moxiegirl
1f27ebc2c7 Merge pull request #11880 from miwest929/feature/add_man_pages_docs 
Feature/add man pages docs
 2015-03-29 09:39:56 -07:00
Ian Babrou
0dc996a7d7 fixed code formatting on docs.docker.com 
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
 2015-03-28 14:32:53 +03:00
Michael West
b4905859d5 Add a missing definite article 
Signed-off-by: Michael West <mwest@mdsol.com>
 2015-03-27 23:35:37 -04:00
Michael West
f7d75cc08a Add man pages generation instructions. 
Signed-off-by: Michael West <mwest@mdsol.com>
 2015-03-27 23:35:13 -04:00
Harry Zhang
194cad243c Remove dupllicated prefix to make table shorter & fix bugs 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
 2015-03-28 01:49:28 +00:00
Jessie Frazelle
221ff368df Merge pull request #11852 from clnperez/doc-dev-container 
Fix typo in doc at /set-up-dev-env
 2015-03-27 15:03:36 -07:00
Ahmet Alp Balkan
de09c55394 Update boot2docker on Windows documentation 
Boot2Docker experience is updated now that we have a Docker
client on Windows. Instead of running `boot2docker ssh`, users
can also use boot2docker on Windows Command Prompt (`cmd.exe`)
and PowerShell.

Updated documentation and screenshots, added a few details,
reorganized sections by importance, fixed a few errors.

Remaining: the video link in the Demonstration section needs
to be updated once I shoot a new video.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-27 14:54:37 -07:00
Ahmet Alp Balkan
986ae5d52a docs: remove unused windows images 
These images was just sitting around and referenced from
nowhere, nor they seemed any useful.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-27 13:59:35 -07:00
Elijah Zupancic
de45aacc32 Added updated working Riak Dockerfile and documentation. 
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
 2015-03-27 12:03:46 -07:00
Elijah Zupancic
31c5041157 Removed references to creating an OpenSSH server. This method of accessing the Docker container is no longer needed now that the exec command is available. 
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
 2015-03-27 12:03:34 -07:00
Elijah Zupancic
17303b18b8 Removed ulimit steps from Dockerfile because they aren't applied according to @cpuguy83. 
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
 2015-03-27 12:03:24 -07:00
cheney90
89a29d7e99 Add capabilities list information table. 
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
 2015-03-27 08:45:36 +00:00
Christy Perez
dd6f988b23 Fix typo in doc at /set-up-dev-env 
Save a whale!

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2015-03-26 21:46:35 -05:00
Katrina Owen
54c9ae187f Clarify git instructions in project guide. Fixes #11796 
The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.

I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.

Signed-off-by: Katrina Owen <katrina.owen@gmail.com>
 2015-03-26 19:24:14 -07:00
moxiegirl
d2df901be3 Merge pull request #11846 from voltaic/master 
Update set-up-dev-env.md
 2015-03-26 18:09:28 -07:00
moxiegirl
cd8ea1d17e Merge pull request #11793 from lolilo/update-project-doc 
fix typos, grammar, more concise wording
 2015-03-26 17:57:45 -07:00
Daniel S
ddcb3ad061 Update set-up-dev-env.md 
Signed-off-by: graycoder <patgray1127@gmail.com>
 2015-03-26 19:41:31 -04:00
moxiegirl
8c1118a8f9 Merge pull request #11832 from jamiehannaford/patch-1 
Fix spelling
 2015-03-26 15:47:27 -07:00
moxiegirl
296642035d Merge pull request #11801 from hqhq/hq_fix_doc_for_exec 
update docs for container exec
 2015-03-26 15:31:16 -07:00
John Willis
2c07fd9fdf #11465 Add additional doc for locagi registries on pull command - for docker-pull.1.md 
Signed-off-by: John Willis <john.willis@docker.com>
 2015-03-26 16:09:56 -04:00
Jamie Hannaford
7fdf5257b4 Make gofmt use the filename previously referenced 
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
 2015-03-26 20:39:15 +01:00
Jamie Hannaford
849e55f4e4 Fix spelling 
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
 2015-03-26 20:24:01 +01:00
Mary Anthony
29d01b7dde Removing sudo from command line examples 
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-26 11:12:37 -07:00
Mary Anthony
a4609a1dfb Removing sudo from examples 
We now have instructions in our Unix installs about setting up
docker group to avoid sudo.  Also, Mac/Windows shouldn't use
sudo.  So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-26 10:13:19 -07:00
Daniel, Dao Quang Minh
d7bbe2fcb5 document dirperm1 fix for #783 in known issues 
Since `dirperm1` requires a more recent aufs patch than many current OS release,
we cant remove #783 completely. This documents that docker will apply `dirperm1`
automatically for systems that support it

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-03-26 07:46:13 +00:00
Qiang Huang
fabb5114d8 update docs for container exec 
https://github.com/docker/docker/pull/11665 This PR changed container
exec API response, we need docs updated.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-26 13:55:46 +08:00
Amy Lindburg
0f702094ec Fixing typo in cd instruction 
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
 2015-03-25 21:52:32 -07:00
Steve Francia
ff2fc9757d Merge pull request #11781 from xamyzhao/patch-1 
Updated step 5 with Windows instructions so that installation works in W...
 2015-03-25 23:51:35 -04:00