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
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
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
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
Alexander Morozov
a4e1de58a3
Merge pull request #11727 from tiborvass/carry-11441
...
Carry 11441: fix docker ps help message
2015-03-24 14:42:02 -07:00
jimmyxian
a153e80f72
fix docker ps help message
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-24 15:33:53 -06:00
Mary Anthony
6de806f348
Adding in comments from party
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-24 11:25:26 -07:00
moxiegirl
4b4bdb5be5
Merge pull request #11697 from pdxdan/7447-GID-Doc
...
Updated Dockerfile and docker-run documentation for USER commands
2015-03-24 09:17:41 -07:00
moxiegirl
dbd00822ec
Merge pull request #11693 from jessedearing/login_docs
...
Add documentation about the semantics of `docker login` @jessedearing thanks for the PR!
2015-03-24 09:13:53 -07:00
moxiegirl
d827b4d235
Merge pull request #11688 from afewremarks/master
...
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
2015-03-24 09:12:00 -07:00
moxiegirl
05c23cad85
Merge pull request #11690 from ssdonline/fix_issue_11683
...
Fixes error #11683
2015-03-24 06:28:24 -07:00
Qiang Huang
a5cbb5c3ae
add cpuset and examples to run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-24 18:48:08 +08:00
Jesse Dearing
ed0d2ac3b7
Add documentation about the semantics of `docker login`
...
Fixes #10550
Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com>
2015-03-23 23:53:50 -07:00
Qiang Huang
0f9c20fe68
docs: add memory and swap memory usage examples
...
fix: https://github.com/docker/docker/issues/11629
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-24 13:45:16 +08:00
moxiegirl
617f18b001
Merge pull request #11692 from khoomeister/ck-fix-another-typo
...
fix test-and-docs typo "do" to "due"
2015-03-23 21:36:40 -07:00
Chris Khoo
df98ce0a28
fix test-and-docs typo "do" to "due"
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com>
2015-03-23 21:12:09 -07:00
Dan Anolik
a57d7c5c79
Added documentation for specifying groupname or GID for commands. Also clarified used of the possible use of multiple USER commands in a Dockerfile.
...
Signed-off-by: Dan Anolik <dan@anolik.net>
2015-03-23 20:47:04 -07:00
Swapnil Daingade
6fa6b5bcbb
Fixes error #11683
...
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com>
2015-03-23 23:45:55 -04:00
Mark West
ef0275c66c
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
...
Signed-off-by: Mark West <markewest@gmail.com>
2015-03-23 20:16:40 -07:00
Chris Khoo
b21751da90
fix broken prerequisite link
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com>
2015-03-23 19:22:17 -07:00
Jamshid Afshar
841692ff86
correcting git fetch command
...
Signed-off-by: Jamshid Afshar <jafshar@yahoo.com>
2015-03-23 19:00:05 -05:00
Natalie Parker
fe1f5ac77c
Added missing code example in the RM command reference of command to delete all stopped containers
...
Signed-off-by: Natalie Parker <nparker@omnifone.com>
2015-03-23 23:05:57 +00:00
Alexander Morozov
65e21f5703
Merge pull request #11458 from ibuildthecloud/syslog
...
Add syslog logging driver
2015-03-23 11:34:33 -07:00
Tibor Vass
61966d281b
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
2015-03-23 13:30:11 -05:00
Jessie Frazelle
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
moxiegirl
0b63b343e8
Merge pull request #11505 from lloydde/doc-ref-run-it
...
doc: reference/run introduce -it .
2015-03-22 19:14:34 -07:00
moxiegirl
0926a023d6
Merge pull request #11550 from moxiegirl/adjust-mac-install
...
Clarifying structure in light of Kitematic
2015-03-22 19:13:38 -07:00
Casey Bisson
a71d89d041
Merge branch 'master' of github.com:docker/docker into joyentinstall
...
Reolved conflict in:
docs/mkdocs.yml
Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
2015-03-22 18:19:27 -07:00