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
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
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
Liana Lo
4982374739
fix typos, grammar, more concise wording
...
Signed-off-by: Liana Lo <liana.lixia@gmail.com>
2015-03-25 20:03:42 -07:00
moxiegirl
f84086be2a
Merge pull request #11776 from shin-/security_opt_docs_fix
...
API docs fix for SecurityOpt parameter.
2015-03-25 18:20:59 -07:00
xamyzhao
ba222f7bc8
Updated step 5 with Windows instructions so that installation works in Windows
...
Signed-off-by: Amy Zhao <x.amy.zhao@gmail.com>
Signed-off-by: Amy Zhao <xamyzhao@mit.edu>
2015-03-25 20:32:50 -04:00
Joffrey F
61dba98608
SecurityOpt parameter is singular, and belongs in HostConfig
...
since API 1.17
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-03-25 16:25:13 -07:00
Arnaud Porterie
e589dc7424
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
2015-03-25 16:24:57 -07:00
Tibor Vass
8d62e12f4d
Merge pull request #11745 from imdreamrunner/patch-1
...
Add missing newline for bash code example
2015-03-25 16:58:55 -06:00
Sebastiaan van Stijn
6fdb583f38
Fix typo "WRKDIR" -> "WORKDIR"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-03-25 23:47:38 +01:00
Ankush Agarwal
161c2e5e74
Rename Fds to File Descriptors in docker info
...
This makes the docker info more readable. Also change a log line
in a test file renaming Fds
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-03-25 12:04:15 -07:00
Vincent Batts
7617ec176d
.: remove trailing white spaces
...
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-03-25 13:38:17 -04:00
Xinzi Zhou
ed7907a988
Add missing newline for bash code example
...
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com>
2015-03-26 01:24:00 +08:00
Tibor Vass
0252ad0adc
Revert "Dealing with trailing whitespaces"
...
The validation script from #10681 is too pedantic, and does not handle
well situations like:
```
cat <<EOF # or <<-EOF
Whether the leading whitespace is stripped out or not by bash
it should still be considered as valid.
EOF
```
This reverts commit 4e65c1c319
.
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-03-25 10:04:56 -06:00
moxiegirl
dea660874c
Merge pull request #11715 from duglin/DocCliEnvVars
...
Add some info about what environment variables are available
2015-03-25 07:29:27 -07:00
moxiegirl
67eb10defe
Merge pull request #11694 from hqhq/hq_add_memsw_example
...
docs: add memory and swap memory usage examples
2015-03-25 07:01:44 -07:00
Doug Davis
0d2190e679
Add some info about what environment variables are available
...
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-24 18:29:21 -07:00
Arnaud Porterie
322095ed63
Merge pull request #10681 from noironetworks/whitespaces-cleaner
...
Removed all trailing whitespaces from every text file
2015-03-24 16:02:14 -07:00