74b9d04473
Merge pull request #11997 from tiborvass/carry-11926
...
Carry 11926: Added information about accessing host directory on Windows.
Upstream-commit: 05753288c462b603d7979d2febf66bca7aa6741a
Component: engine
2015-04-03 06:43:38 -07:00
77e454c28a
Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow
...
Explain advanced contribution workflow more
Upstream-commit: da61228501acf24e651e167efb7b3c25c6bf5548
Component: engine
2015-04-03 06:41:49 -07:00
088a52cbda
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
2015-04-02 08:25:49 -04:00
cd5f423b1f
Bump API version and docs to v1.19
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
2015-04-01 13:40:56 -07:00
c3eb3fd267
Added information about accessing host directory on Windows.
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 6e46204ab80b6df52c168fc06873280fc051d768
Component: engine
2015-04-01 13:36:43 -04:00
3e035d76a2
Add support for more advanced ${xxx:...} syntax
...
Just ${xxx:+...} and ${xxx:-...} for now
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 39908fc6d9a13f0d44196475ba938b6cc352fdbe
Component: engine
2015-04-01 08:11:15 -07:00
2a679a09de
Merge pull request #11969 from powo/patch-1
...
Update networking.md (IPv6 wrong prefix)
Upstream-commit: 39711c8b26ccbeace0a6ec9246ad0ba65e468904
Component: engine
2015-04-01 07:45:31 -07:00
97627eb7d2
Merge pull request #11972 from thaJeztah/docs-fix-heading-level
...
docs: fix heading level of logging drivers
Upstream-commit: dc564d8cf8ba5221edcddc267d0ae7ac9a2b73da
Component: engine
2015-04-01 07:34:45 -07:00
631fb354cf
Merge pull request #11982 from sunyuan3/docker-run
...
Fix typoes in docker-run.1.md
Upstream-commit: f73109b8833517e2d095e5e9be0acaa17284738e
Component: engine
2015-04-01 07:32:06 -07:00
df6b8b71c3
Fix typoes in docker-run.1.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a44451d40eb3e1b3d19a0525f70736406c66d2d1
Component: engine
2015-04-01 17:09:01 +08:00
1394c160e0
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 >
Upstream-commit: f855d5dde70f1f3e4390e53576a3ca9b5a9db8ba
Component: engine
2015-04-01 01:07:22 +02:00
179a6af99a
Update networking.md
...
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at >
Upstream-commit: 6a47c70d60f5ac92b152e1c8ef7fe5b714fe7833
Component: engine
2015-04-01 00:44:41 +02:00
58162ddd3e
Use different host and container port for clarity
...
Fixes #11953
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 8caf8f0a79df8dcdac122157a917504b414e4ecf
Component: engine
2015-03-31 11:59:58 -07:00
bc620e0b67
Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table
...
Fix-11752 add capabilities list information table.
Upstream-commit: 97f621bcd84af39a92b5450a9450941651749944
Component: engine
2015-03-30 23:18:30 -04:00
b39200ad98
Revison the some columns to make table clearer
...
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
Upstream-commit: bf15f675b9042db661de720900f367eff19737c0
Component: engine
2015-03-31 02:41:49 +00:00
d7e9f5fdd9
Merge pull request #11799 from dqminh/aufs-dirperm1
...
aufs: apply dirperm1 by default if supported
Upstream-commit: 14fed352cbb29232af1644e49e019da897a44de6
Component: engine
2015-03-30 11:36:02 -07:00
5ba38993bc
Explain --net=host option usage
...
Fixes #11630
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: ddd27616e0abe44c7589b15de3fdbf5bb043ea6a
Component: engine
2015-03-30 10:28:44 -07:00
6b249811ef
Merge pull request #11678 from botchagalupe/docker-11465
...
Closes #11465 - Add additional doc for local registries on pull command
Upstream-commit: 41e47bbf34aa815fbc4fcec1247606b684bb9061
Component: engine
2015-03-29 14:10:20 -07:00
e6d4577421
Merge pull request #11798 from amylindburg/11792-fix-typo
...
Fixing typo in cd instruction
Upstream-commit: 4edf8e1e530fc0e4ff94cfce4600480680ea4458
Component: engine
2015-03-29 14:01:35 -07:00
c36fcf41dd
Merge pull request #11897 from ankushagarwal/glossary
...
Add Glossary to documentation
Upstream-commit: 3bf98692347a72977b9f0e2d7ac8a1d5811ba5d3
Component: engine
2015-03-29 13:49:22 -07:00
1e3a3c6a81
Merge pull request #11885 from bobrik/fix-formatting
...
Fixed code formatting on docs.docker.com
Upstream-commit: 8b3d8f21a07593fb97fb7cf7005931cb14806bba
Component: engine
2015-03-29 13:21:26 -07:00
291fe357b5
Merge pull request #11875 from ahmetalpbalkan/docs/boot2docker-windows
...
Update Documentation for Windows Installation
Upstream-commit: 3ff71c24c17726dd818c46aea9614b27b527156f
Component: engine
2015-03-29 13:18:00 -07:00
77651137b6
Merge pull request #11870 from dekobon/master
...
11558 - Documentation fixes and improvements for Riak Dockerfile
Upstream-commit: 584df44d424b0a884782bf7a9218a5a9473fe12d
Component: engine
2015-03-29 12:42:54 -07:00
a0e1171855
Add Glossary to documentation
...
Closes #11057
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 567f723721b7bac57a91d82d27472e568a101c4f
Component: engine
2015-03-29 12:24:54 -07:00
4c2d9f8cc3
Merge pull request #11880 from miwest929/feature/add_man_pages_docs
...
Feature/add man pages docs
Upstream-commit: 1f27ebc2c79becebe489f555ff02cef93a2b16be
Component: engine
2015-03-29 09:39:56 -07:00
3e352e0688
fixed code formatting on docs.docker.com
...
Signed-off-by: Ian Babrou <ibobrik@gmail.com >
Upstream-commit: 0dc996a7d779100b44e5c6f492efe231140d76cf
Component: engine
2015-03-28 14:32:53 +03:00
1a8787e1e6
Add a missing definite article
...
Signed-off-by: Michael West <mwest@mdsol.com >
Upstream-commit: b4905859d55cf756d3855c1deddb68a9509bdab4
Component: engine
2015-03-27 23:35:37 -04:00
93a82de971
Add man pages generation instructions.
...
Signed-off-by: Michael West <mwest@mdsol.com >
Upstream-commit: f7d75cc08a6ebdc50ea9b7473342fdf6e22dc848
Component: engine
2015-03-27 23:35:13 -04:00
3f29284d18
Remove dupllicated prefix to make table shorter & fix bugs
...
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
Upstream-commit: 194cad243ccf622c8ff048975e26cc6c51ccbf30
Component: engine
2015-03-28 01:49:28 +00:00
0c7e99e9f0
Merge pull request #11852 from clnperez/doc-dev-container
...
Fix typo in doc at /set-up-dev-env
Upstream-commit: 221ff368df540bc2af259ad64455af8ac3394311
Component: engine
2015-03-27 15:03:36 -07:00
ae9c41e1ac
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 >
Upstream-commit: de09c553946943e9f4be5b3d0c4edf03b740ccf4
Component: engine
2015-03-27 14:54:37 -07:00
4f89fcb499
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 >
Upstream-commit: 986ae5d52afe91da6f9e836f8e4ba2148b2c5193
Component: engine
2015-03-27 13:59:35 -07:00
6280a1894a
Added updated working Riak Dockerfile and documentation.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
Upstream-commit: de45aacc322445924710fc12ad6e2d9832c27c6e
Component: engine
2015-03-27 12:03:46 -07:00
0644b1baca
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 >
Upstream-commit: 31c50411574b19cb81b5f88c0f8ca4bb4a2ead83
Component: engine
2015-03-27 12:03:34 -07:00
0134fde659
Removed ulimit steps from Dockerfile because they aren't applied according to @cpuguy83.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
Upstream-commit: 17303b18b8813a184dadaacf63b10a419e476d07
Component: engine
2015-03-27 12:03:24 -07:00
61457ac29a
Add capabilities list information table.
...
Signed-off-by: Chen Qiu <21321229@zju.edu.cn >
Upstream-commit: 89a29d7e99e57bcbcf87a7657070bfdf59d7b6ad
Component: engine
2015-03-27 08:45:36 +00:00
f047f87e51
Fix typo in doc at /set-up-dev-env
...
Save a whale!
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: dd6f988b23b56ce0ca17ab892143db53f1fa2f84
Component: engine
2015-03-26 21:46:35 -05:00
eb6bec8a3c
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 >
Upstream-commit: 54c9ae187f5a3544881650c09e923d67ed229771
Component: engine
2015-03-26 19:24:14 -07:00
c6343683c9
Merge pull request #11846 from voltaic/master
...
Update set-up-dev-env.md
Upstream-commit: d2df901be3c5c964900de41286ba0c67aebfb5d1
Component: engine
2015-03-26 18:09:28 -07:00
34262a08d7
Merge pull request #11793 from lolilo/update-project-doc
...
fix typos, grammar, more concise wording
Upstream-commit: cd8ea1d17eff2424df6a63ef8de314e5724fd37a
Component: engine
2015-03-26 17:57:45 -07:00
99064ea4ea
Update set-up-dev-env.md
...
Signed-off-by: graycoder <patgray1127@gmail.com >
Upstream-commit: ddcb3ad061db518aa076422ed6d81a2247fb3a8e
Component: engine
2015-03-26 19:41:31 -04:00
44f1acd948
Merge pull request #11832 from jamiehannaford/patch-1
...
Fix spelling
Upstream-commit: 8c1118a8f92400d8e3847b9aa5fc12b25fd17def
Component: engine
2015-03-26 15:47:27 -07:00
1b99faf246
Merge pull request #11801 from hqhq/hq_fix_doc_for_exec
...
update docs for container exec
Upstream-commit: 296642035df602a788c042ae09573f65cd29b200
Component: engine
2015-03-26 15:31:16 -07:00
6446908d00
#11465 Add additional doc for locagi registries on pull command - for docker-pull.1.md
...
Signed-off-by: John Willis <john.willis@docker.com >
Upstream-commit: 2c07fd9fdf78842b4a09ff9a226bd57ba500f16b
Component: engine
2015-03-26 16:09:56 -04:00
21101c3fb4
Make gofmt use the filename previously referenced
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 7fdf5257b4d4c94196303cba52b1882001d32754
Component: engine
2015-03-26 20:39:15 +01:00
e68fde69b6
Fix spelling
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 849e55f4e499f729e7e63ca2b20f3371a8e15d86
Component: engine
2015-03-26 20:24:01 +01:00
e5276fe0a7
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 >
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
2015-03-26 11:12:37 -07:00
d294d535e9
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 >
Upstream-commit: a4609a1dfbcfb2fea10aa2be15124e0809528d04
Component: engine
2015-03-26 10:13:19 -07:00
0c673d5d15
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 >
Upstream-commit: d7bbe2fcb5bf44f2fbcfa472e2a06c83d5d3aca1
Component: engine
2015-03-26 07:46:13 +00:00
f182e61c8b
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 >
Upstream-commit: fabb5114d808d127436121d28e320fd065f30865
Component: engine
2015-03-26 13:55:46 +08:00
