0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15183 commits 14 branches 412 tags 338 MiB
Commit graph

3504 commits

Author SHA1 Message Date
moxiegirl
96c3141fa5 Merge pull request #12020 from chenhanxiao/docker-import-commit 
docs: keep the style of docker-commit consistent with docker-import
 2015-04-06 09:47:47 -07:00
moxiegirl
d489b91aa9 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754 
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
 2015-04-06 09:23:53 -07:00
Deng Guangxing
71de711189 fix typo in cli.md 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-06 16:11:40 +08:00
Raghuram Devarakonda
9287e70c12 Add the missing option to the wget command for updating Docker. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-04-05 23:00:21 -04:00
Simei He
5057d7da13 fix the space thing. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-06 09:00:59 +08:00
Kirill SIbirev
ac12c80537 Improved "start a container" section in 1.16 & 1.17 docs 
It seems it was lost or something

Signed-off-by: Kirill Sibirev <l0kix2@gmail.com>
 2015-04-04 11:23:49 +03:00
Tonny Xu
e50636617f Updated the explanation of ONBUILD in best-practices doc 
Signed-off-by: Tonny Xu <tonny.xu@gmail.com>
 2015-04-04 12:46:25 +09:00
Jessie Frazelle
4d571257ed Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update 
docs: Add new windows installation tutorials
 2015-04-03 20:39:21 +00:00
moxiegirl
fb1e10284b Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter 
docs: fix bullet list and missing label filter
 2015-04-03 12:33:22 -07:00
moxiegirl
a6c04f33e1 Merge pull request #12003 from sleinen/patch-1 
Make explanation consistent with command
 2015-04-03 12:19:37 -07:00
moxiegirl
6d5a0ac11e Merge pull request #12057 from icecrime/11925_carry 
Specify running `boot2docker ip` on host
 2015-04-03 12:11:53 -07:00
Jessie Frazelle
3985dc299a Merge pull request #12054 from eluck/master 
Update userguide/dockervolumes - fixes issue #12052
 2015-04-03 18:58:52 +00:00
Ahmet Alp Balkan
2b320a2309 docs: Add new windows installation tutorials 
Updated Windows installation documentation with newest
screencasts and Chocolatey instructions to install windows
client CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-03 11:33:34 -07:00
moxiegirl
12e7787540 Merge pull request #12017 from moxiegirl/distribution-man-pages 
Updating with man pages for distribution
 2015-04-03 09:55:08 -07:00
Arnaud Porterie
bcbdf77ddb Specify running boot2docker ip on host 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 08:53:44 -07:00
moxiegirl
05753288c4 Merge pull request #11997 from tiborvass/carry-11926 
Carry 11926: Added information about accessing host directory on Windows.
 2015-04-03 06:43:38 -07:00
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
eluck
57b09068ef Update userguide/dockervolumes - fixes issue #12052 
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me>
 2015-04-03 14:07:51 +03:00
Simei He
8c578b8190 minor edits. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-03 14:43:21 +08: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
Chen Hanxiao
8fa03df885 docs: keep the style of docker-commit consistent with docker-import 
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-02 05:01:14 -04:00
Mary Anthony
b6d55ebcbc Updating with man pages for distribution 
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-01 21:02:19 -07:00
Sebastiaan van Stijn
37c7f3a204 docs: fix bullet list and missing label filter 
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-04-02 01:48:28 +02:00
Nick Irvine
1a4d2a5c8b Add some new graphics for installation and understanding docs 
Fixes: #11552

- scalable SVG
- uses colours from the rest of the page
- emphasizes that boot2docker is the ordinary Linux setup in a VM
- Add new graphic for architecture diagram
- Add windows boot2docker diagram
- Add windows diagram to documentation
- Remove old PNGs; replaced with SVGs
- Add redirects for new SVG versions of installation diagrams

Signed-off-by: Nick Irvine <nfirvine@nfirvine.com>
 2015-04-01 14:24:53 -07: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
Simon Leinen
b58c4b8e68 Make explanation consistent with command 
To reduce confusion of the reader.  Fixes a likely cut & paste error.

Signed-off-by: Simon Leinen <simon.leinen@gmail.com>
 2015-04-01 21:54:21 +02:00
Jay
6e46204ab8 Added information about accessing host directory on Windows. 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-01 13:36:43 -04: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
Deng Guangxing
f5a401d3fe docker info show logging driver info 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-01 16:05:14 +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
dalanlan
8d3d34d5e3 fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-03-31 10:13:37 +08: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
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
Maxim Kulkin
b4d7b0f865 Explain advanced contribution workflow more 
Explain why advanced contribution workflow have to be so complex

Signed-off-by: Maxim Kulkin <mkulkin@mirantis.com>
 2015-03-25 18:04:41 -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
John Willis
3d28fc7d1c #11465 Add additional doc for locagi registries onn pull command 
Signed-off-by: John Willis <john.willis@docker.com>
 2015-03-23 21:00:02 -04: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
Sven Dowideit
cce196d64b Merge pull request #10903 from programmerq/docs_submodules 
Update docs around private github submodules in automated builds.
 2015-03-23 11:01:28 +10:00
Sven Dowideit
cf7d093e17 Merge pull request #11400 from ahmetalpbalkan/docs/azure 
docs: Add Microsoft Azure installation instructions
 2015-03-23 10:03:00 +10:00
Mary Anthony
fdbec26411 Updating in light of new contributors guide 
Link to new guide. Added a quickstart contributor guide for experienced people.
Converting narrative style to procedures for easier use. I think there is something missing in the
release publishing section...but it looks like it was missing in the original.
Updates per thaJeztah
Edits per Fred
Updating with comments from Sven

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-22 11:55:32 -07:00
Raghuram Devarakonda
f5c60fc0fd Fix typo in git setup doc. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-03-22 11:22:47 -04:00
Peter Waller
671c12204c Implement build cancellation 
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
 2015-03-22 11:31:28 +00:00
Mary Anthony
f3b7bf9682 Clarifying structure in light of Kitematic 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-21 18:20:25 -07:00
sidharthamani
eaecd8b1b5 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
 2015-03-21 18:01:18 -07:00
Mary Anthony
3ff9991bb2 Update contributor docs and triage to match new labeling system 
Add clarification around experience
Adding test
improvement > enhancement

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-21 15:55:33 -07:00
Doug Davis
6d66e3e7a5 Fix some escaping around env var processing 
Clarify in the docs that ENV is not recursive

Closes #10391

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-20 20:09:00 -07:00
Todd Whiteman
fe21c7a4be docs: cli: reorder rename command to be in alphabetical order 
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
 2015-03-20 14:51:39 -07:00
Casey Bisson
19e3db3503 updated text 
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
 2015-03-20 14:44:24 -07:00
Casey Bisson
cb2280c98e Merge branch 'master' of github.com:docker/docker into joyentinstall 
Resolved conflict in the following file:
	docs/sources/installation/MAINTAINERS

File was deleted upstream and changed in this branch. Deleting the file in this branch as well.

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
 2015-03-20 14:37:17 -07:00
Phil Estes
d2cb3af75b Merge pull request #11481 from jfrazelle/perms-on-release 
cleanup docs/release.sh
 2015-03-20 10:57:43 -04:00
Ahmet Alp Balkan
72fa3fcaea docs: Add Azure installation instructions 
Adding instructions that refers to the Microsoft Azure
documentation on creating Docker-ready Linux VMs on Azure
platform.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-19 21:28:29 -07:00
Sven Dowideit
32efa559a3 Small copy edits 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-03-20 14:09:30 +10:00
Jessica Frazelle
844c0f154a change perms on release and cleanup docs 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-19 21:07:02 -07:00
Jessie Frazelle
f574262ff7 Merge pull request #11470 from albers/events-filter-name 
Remove 'name' filter from docker events documentation
 2015-03-19 16:22:30 -07:00
Jessie Frazelle
0d3da36a5f Merge pull request #11479 from falmp/patch-1 
Fixed --read-only description indentation
 2015-03-19 16:22:08 -07:00
Jessie Frazelle
fcc87c0df0 Merge pull request #11498 from jbnunn/patch-1 
Typo/grammar corrections to dockerizing.md
 2015-03-19 16:21:29 -07:00
Michael Crosby
455a272aef Merge pull request #11428 from vishh/parent-cgroup 
Adding '--cgroup-parent' option.
 2015-03-19 14:41:57 -07:00
Lloyd Dewolf
6ca1494f19 doc: reference/run introduce -it . 
Also:
- Fix "docker" cmd always "sudo docker" for docs.
- Fix "-ti" with "-it".
- fix "/docker" typo.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
 2015-03-19 13:59:40 -07:00
Sebastiaan van Stijn
cf0634b937 Optimize images 
Optimized new screenshots, reduced file-size with 50%

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-03-19 10:01:43 -06:00
Jeff Anderson
390dd4bf3f Update docs around private github submodules in automated builds. 
Signed-off-by: Jeff Anderson <jeff@docker.com>
 2015-03-19 10:01:43 -06:00
J. Nunn
a8faba021c Typo/grammar corrections to dockerizing.md 
Added commas where necessary, edited typos to improve readability.

Signed-off-by: J. Nunn <jeffnunn@amazon.com>
 2015-03-19 10:51:12 -05:00
falmp
b311066d24 Fixed --read-only description indentation 
The wrong indentation was breaking documentation layout with code blocks.

Signed-off-by: Francisco Lopes <chico.lopes@gmail.com>
 2015-03-19 11:53:50 -03:00
Harald Albers
ec7530afde Remove 'name' filter from docker events documentation 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-03-19 08:51:36 +01:00
James Turnbull
33bec0a7f6 Merge pull request #11028 from jstangroome/patch-1 
Correct IP/MAC address generation docs
 2015-03-19 01:44:43 -04:00
Vishnu Kannan
c7267017e9 Adding integration tests for --cgroup-parent feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-19 02:34:42 +00:00
Vishnu Kannan
f7dd1333b5 Adding documentation for '--cgroup-parent' option. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-19 02:34:15 +00:00
Doug Davis
2cde817458 Merge pull request #11410 from cpuguy83/10191_build_resources 
Allow setting resource constraints for build
 2015-03-18 21:44:21 -04:00
Brian Goff
e6ae89a45a Allow setting resource constrains for build 
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-18 20:57:13 -04:00
moxiegirl
068d343ddf Merge pull request #11452 from jeffdm/master 
Adding Kitematic link to Mac OS X install instructions in docs
 2015-03-18 17:32:48 -07:00
Jeffrey Morgan
3ddf5d7517 Adding Kitematic link to Mac OS X install instructions 
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com>
 2015-03-18 16:32:59 -07:00
Jessie Frazelle
42f5c87425 Merge pull request #11328 from jfrazelle/fix-docs-release-script 
Fix clear cache docs release.
 2015-03-18 16:06:27 -07:00
Tibor Vass
8ec4e69839 Merge pull request #11430 from jfrazelle/export_outputflag 
Modified `docker export` to allow an --output flag
 2015-03-18 19:04:43 -04:00
moxiegirl
50bf3cbedc Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144 
Clarify behavior of docker cp
 2015-03-18 08:46:52 -07:00
Sebastiaan van Stijn
4e6a01023b cleanup: docs: remove temporary inline styles 
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868).

This removes those temporary `<style>` tags.

depends on #11230 (https://github.com/docker/docker/issues/11230)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-03-17 22:48:28 +01:00
Mary Anthony
f60ed98e79 # This is a combination of 2 commits. 
# The first commit's message is:

Updating Ubuntu installation to use wget; eliminating elo

Signed-off-by: Mary Anthony <mary.anthony@docker.com>

# This is the 2nd commit message:

Adding in James comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-17 10:15:46 -07:00
Mary Anthony
241579a34f Fixing it back 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-17 10:07:09 -07:00
moxiegirl
2ab105e9fe Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882 
Return of the Ring: Metadata Labels Doc Tweaks
 2015-03-17 09:47:36 -07:00
Arnaud Porterie
1ff5a91007 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
 2015-03-17 09:45:58 -07:00
Andy Goldstein
a2b0c9778f Add ability to refer to image by name + digest 
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2015-03-17 10:10:42 +00:00
Joseph Kern
5ff122f797 Modified docker export to allow an --output flag 
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added an --output flag to docker export and created tests.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added text to reflect a new output option for the export command.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Whitespace clean up

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added man page documentation for the new --output flag in export

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
 2015-03-17 00:20:19 -07:00
Mary Anthony
6ddfe883dd Updating with Sven's comments and other tweaks 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-16 21:49:33 -07:00
André Martins
4e65c1c319 Dealing with trailing whitespaces 
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*

Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md

Signed-off-by: André Martins <martins@noironetworks.com>
 2015-03-17 03:34:01 +00:00
Arnaud Porterie
b6ac111abf Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
 2015-03-16 20:20:05 -07:00
James Turnbull
97a5c584b3 Merge pull request #11429 from tianon/eval-shellinit 
Add "eval" to every invocation of "boot2docker shellinit"
 2015-03-16 21:19:50 -04:00
Jessie Frazelle
da24ba42e2 Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference 
docs: use more tables in run reference and minor fixups
 2015-03-16 18:02:42 -07:00
Michael Crosby
e6b18cb66d Merge pull request #11210 from xuhdev/patch-1 
Update doc: "docker create" must specify a command
 2015-03-16 17:43:17 -07:00
Tianon Gravi
200123b317 Add "eval" to every invocation of "boot2docker shellinit" 
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-03-16 18:27:59 -06:00
Jessie Frazelle
f4f10cf43b Merge pull request #11203 from rhatdan/Dockerfile 
We had some testers who found a hard to diagnose bug in Dockerfile
 2015-03-16 17:26:18 -07:00
Jessie Frazelle
44e9715e46 Merge pull request #10723 from SvenDowideit/takeover-10653 
Update sample systemd for container
 2015-03-16 17:18:57 -07:00
Jessie Frazelle
c7f5ee9d69 Merge pull request #10816 from SvenDowideit/docker-build-return-code 
Add some information about the docker build return code
 2015-03-16 17:18:26 -07:00
Darren Shepherd
fae92d5f0a Documentation changes for labels 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-16 17:08:40 -07:00
Tibor Vass
085054db9d Merge pull request #10591 from duglin/ErrUnknownCmd 
Generate an error on unknown Dockerfile instruction
 2015-03-16 17:47:28 -04:00
Jessie Frazelle
61e7efeadd Merge pull request #11364 from Mashimiao/update-manpage 
Update docker manpage
 2015-03-16 14:13:27 -07:00
Mary Anthony
9a78ed8f48 Clarify behavior of docker cp 
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.

Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-16 12:44:28 -07:00
sapphiredev
4b0744b119 Fix minor typo 
Signed-off-by: sapphiredev <se.imas.kr@gmail.com>
 2015-03-16 19:50:52 +09:00
Sven Dowideit
88924993a2 Merge pull request #11393 from enguerran/patch-1 
Ambiguous example in registry_mirror.md
 2015-03-16 16:21:00 +10:00
Arnaud Porterie
bc7d1d6ef3 Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig 
move resource options from Config to hostConfig
 2015-03-15 17:30:46 -07:00
Enguerran
0cd857d99f Update registry_mirror.md 
The syntactic coloration is a little bit ambiguous, I suggest this as a fix.

Signed-off-by: Enguerran Colson <engcolson@gmail.com>
 2015-03-15 12:35:43 +01:00
Mary Anthony
dc899c4eaf Adding in minor copy edits 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-14 21:31:36 -07:00
James Turnbull
495f5e4998 Merge pull request #11321 from duglin/CmdLineTweak 
Add "Docker" to Reference pull-down for Command Line
 2015-03-14 21:04:25 -06:00
moxiegirl
2830b6fa58 Merge pull request #11297 from moxiegirl/11235-tweak-doc 
Consistency in the restart policy docs
 2015-03-14 19:58:46 -07:00
Doug Davis
8a5b50d65d Generate an error on unknown Dockerfile instruction 
Instead of just printing a warning and going on, this will generate
an error and stop processing.

This used to be part of #10561 but I decided it might need its own
independent discussion/PR as to not derail #10561.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-13 16:08:34 -07:00
James Turnbull
e2ca237aa2 Merge pull request #11345 from x1022as/cli 
Change cli.md to show right `docker rmi` output
 2015-03-13 16:33:03 -06:00
Jessie Frazelle
d2f925fb27 Merge pull request #11373 from tianon/move-hack-scripts-back 
Move scripts back to hack/, leave docs in project/
 2015-03-13 15:26:54 -07:00
Alexander Morozov
02c1dd899a Merge pull request #10238 from miminar/ephemeral-port-range-allocation 
Use system's ephemeral port range for port allocation
 2015-03-13 15:18:05 -07:00
Alexander Morozov
bdf3a0295d Fail docker logs on all logging drivers apart from 'json-file' 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 15:02:09 -07:00
Tianon Gravi
949a21b55f Move scripts back to hack/, leave docs in project/ 
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-03-13 14:04:08 -06:00
Alexander Morozov
47a6afb93f Default 'json-file' logging driver and none logging driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 12:13:21 -07:00
Darren Shepherd
03cea0ef23 Docs changes for labels based on feedback 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-13 11:56:33 -07:00
Sabin Basyal
dba4651760 Update Centos links 
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
 2015-03-13 11:48:09 -07:00
Sebastiaan van Stijn
7d89e66dac Add labels documentation 
Adds more documentation for labels and adds the label instruction to the
man-pages.

Also included is a document called "Labels - custom meta-data in Docker"
in the user-guide, this is still a work-in-progress I started to describe
the "namespaces" conventions, an example on storing structured data.

I ran a bit "out of steam" (writers block?) on that document, but kept
it in (for now), in case it still ends up useful.

The Remote API documentation changes will need to be moved to the
docker_remote_api_v1.18.md document when rebasing the whole PR.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-13 10:02:04 -07:00
Darren Shepherd
389eee1084 Add docs for container/image labels 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-13 10:02:04 -07:00
Dan Walsh
cdfdfbfb62 Allow specification of Label Name/Value pairs in image json content 
Save "LABEL" field in Dockerfile into image content.

This will allow a user to save user data into an image, which
can later be retrieved using:

docker inspect IMAGEID

I have copied this from the "Comment" handling in docker images.

We want to be able to add Name/Value data to an image to describe the image,
and then be able to use other tools to look at this data, to be able to do
security checks based on this data.

We are thinking about adding version names,
Perhaps listing the content of the dockerfile.
Descriptions of where the code came from etc.

This LABEL field should also be allowed to be specified in the
docker import --change LABEL:Name=Value
docker commit --change LABEL:Name=Value

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-13 09:47:09 -07:00
Ma Shimiao
fa1fa50160 Update docker manpage 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-03-13 15:28:09 +08:00
Mary Anthony
ec728939b1 Breaking out the project into more granular pieces 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
 2015-03-12 22:27:49 -07:00
Deng Guangxing
98610282c2 Change cli.md to show right docker rmi output 
`docker rmi` output in docs/sources/reference/commandline/cli.md
is different from real scene. This commit fixes it.

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-03-12 19:06:48 +08:00
Sebastiaan van Stijn
37d856db14 docs: use more tables in run reference and minor fixups 
This adds two more tables to the run reference documentation.

- the list of 'modes' for Network settings is now a table.
- the "note" for `--net="host"` was moved from the list to the detailed
  description.
- the 'options' for "Runtime constraints on CPU and memory" are
  now a table
- slightly re-worded the description for "memory" options, e.g.
  "It is not allowed..." was rewriten to "The *container* is not allowed..."
- fix example in "Runtime privilege, Linux capabilities, and LXC configuration"
  being indented twice
- slightly reduced indenting in some `usage` output to be better readable.
- fixes a typo `/ets/hosts` -> `/etc/hosts`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-03-11 23:41:57 +01:00
moxiegirl
254b6f8946 Merge pull request #11248 from Finkes/patch-1 
improve Debian installation instructions
 2015-03-11 15:36:01 -07:00
moxiegirl
cc4095a18c Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated 
docs: --api-enable-cors is deprecated,updated docs description
 2015-03-11 15:28:28 -07:00
moxiegirl
5b5b09275e Merge pull request #11329 from estesp/fix-run-test-doc 
Remove escaping from TESTFLAGS; it is no longer required
 2015-03-11 15:01:17 -07:00