dca8944dc0
Merge pull request #11688 from afewremarks/master
...
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
Upstream-commit: d827b4d235f7604e2a4fa7ad95e2d75dafb4ac27
Component: engine
2015-03-24 09:12:00 -07:00
6609e10340
Fixes error #11683
...
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com >
Upstream-commit: 6fa6b5bcbb707a1fe709c5272035b79635c29a78
Component: engine
2015-03-23 23:45:55 -04:00
7c33403b52
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
...
Signed-off-by: Mark West <markewest@gmail.com >
Upstream-commit: ef0275c66c420944dd3de4647d2d25b78f8f1b5a
Component: engine
2015-03-23 20:16:40 -07:00
627077c4f9
Typo/grammar corrections to dockerizing.md
...
Added commas where necessary, edited typos to improve readability.
Signed-off-by: J. Nunn <jeffnunn@amazon.com >
Upstream-commit: a8faba021c569a53f03ed68b27d2f53db2d70f3d
Component: engine
2015-03-19 10:51:12 -05:00
43ac3e6d56
Updating with Sven's comments and other tweaks
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6ddfe883dd0d6ce1f97a121652927ac1b1dbaefe
Component: engine
2015-03-16 21:49:33 -07:00
5f00f97ea0
Merge pull request #9882 from ibuildthecloud/labels
...
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
2015-03-16 20:20:05 -07:00
873a2edf47
Merge pull request #11210 from xuhdev/patch-1
...
Update doc: "docker create" must specify a command
Upstream-commit: e6b18cb66d88e7b4f3762e74ee963c984185df33
Component: engine
2015-03-16 17:43:17 -07:00
845f59abb0
Documentation changes for labels
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: fae92d5f0a1d81a48dc210d5ae28ef83c724b5ac
Component: engine
2015-03-16 17:08:40 -07:00
f9d0cdbb89
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 >
Upstream-commit: 7d89e66dac59999ae2f07970b273e227fdf73ea7
Component: engine
2015-03-13 10:02:04 -07:00
054ec22a23
Use system's ephemeral port range for port allocation
...
Read `/proc/sys/net/ipv4/ip_local_port_range` kernel parameter to obtain
ephemeral port range that now sets the boundaries of port allocator
which finds free host ports for those exported by containers.
Signed-off-by: Michal Minar <miminar@redhat.com >
Upstream-commit: 0eb3544c43cb8e9488d6bf329ceecc11fa0db6f1
Component: engine
2015-03-09 09:13:20 +01:00
cf35f111d7
Update doc: specify a dummy command for "docker create"
...
"docker create" for data containers should specify a dummy command to
avoid accidential "docker start" to cause unexpected data loss.
Signed-off-by: Hong Xu <hong@topbug.net >
Upstream-commit: fb6fab83df5663eb76c8cd57e3845f58c9ee36b3
Component: engine
2015-03-06 14:37:28 -08:00
405e3e2f5f
Merge pull request #11204 from duglin/VolumeDocs
...
Tell users about how VOLUME initializes the new mount point/volume
Upstream-commit: 55fc7f5c9d3bb0e03e76b62c2ff0123a20d5e3c7
Component: engine
2015-03-06 10:44:03 -08:00
ed2fc0acb0
Tell users about how VOLUME initializes the new mount point/volume
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9be2ca2394112d8e988dc492f482cefd93a5b5fb
Component: engine
2015-03-06 10:25:47 -08:00
1f1e8e9abc
Add some text about env vars when linking containers
...
In particular, the security implications.
Closes #5169
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3c9425d40dbb069db9fe795eddc3fccfc62164f8
Component: engine
2015-03-05 09:39:10 -08:00
d372e2ab22
update the mkdocs.yml to add new docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 6d4b0f53342f4b56ad0770bd0e1bce6fcd898a41
Component: engine
2015-02-26 12:11:29 +10:00
0385663f68
Merge pull request #10818 from estesp/link-add-aliases
...
Upstream-commit: 356fe89d2431bd54f38b3477aa91ef276f65ffb7
Component: engine
2015-02-19 17:22:53 -05:00
c4aef2a226
Add linked container's name and hostname as aliases to /etc/hosts
...
Currently when containers are linked the alias name (e.g. from `--link
name:alias`) is added to the parent container's `/etc/hosts` with a
reference to the IP of the linked container. Some software requires
using the official hostname or node name in operations that need to
match on those values, and it is therefore helpful if the parent
container can refer to the child/link using those same values and still
access the same IP.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 16aa64dc82b6434ec78878fa35eb96e4983b46f8
Component: engine
2015-02-19 14:19:38 -08:00
474b56bd0a
Docs: Improve description on volume removal
...
A comment in https://github.com/docker/docker/issues/6354#issuecomment-74160215
brought to light that the "Managing Data in containers" section contained an
incorrect (or confusing) line;
"Volumes persist until no containers use them"
Which implies that volumes are automatically removed if they are no longer
referenced by a container.
This pull-request attempts to add some information explaining that volumes are
never automatically removed by Docker and adds some extra hints on working
with data volumes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 00f2fd1dd5dee53919cda7ed9f5c70ba8558edb5
Component: engine
2015-02-14 17:04:06 +01:00
ccc7d51716
docs: fix typo
...
There are 2 not 3 RUN instructions in the userguide's Dockerfile.
Signed-off-by: Mihai Borobocea <MihaiBorobocea@gmail.com >
Upstream-commit: 48ee443ecaae002cc688c7b03e07ecc670b3b193
Component: engine
2015-02-04 23:15:18 +02:00
e21086902c
Spelling mistake in dockerlinks
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ea6db8af18c9eee2147d78f987cdacacd37e93fb
Component: engine
2015-02-04 12:12:46 +10:00
99f316a4fe
Merge pull request #10480 from yihangho/docstypo
...
Fix a tiny typo.
Upstream-commit: 0018afebb81365ed8920bbc7fe829a5bed744b81
Component: engine
2015-02-03 14:37:35 -08:00
39a298fb43
Fix a tiny typo.
...
'saving', not 'saveing'
Signed-off-by: Yihang Ho <hoyihang5@gmail.com >
Upstream-commit: 50c3ffd00969f8b1f2a00849973f2587984a26bf
Component: engine
2015-02-01 00:37:27 +08:00
3abec8abd0
Fix documentation typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com >
Upstream-commit: 2f5919966af49cd530a60c01b21ddd00c888f207
Component: engine
2015-01-30 12:44:42 -05:00
b5b158f395
Improve explanation of port mapping from containers
...
Signed-off-by: Mehul Kar <mehul.kar@gmail.com >
Upstream-commit: f1bc02e91f79b4a54f47e0ad4abfd3d48b698ec4
Component: engine
2015-01-29 09:09:44 -08:00
304cd59f67
Merge pull request #10135 from coolljt0725/update_link_docs
...
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
2015-01-19 18:12:50 -08:00
6d7d2d6f8c
Merge pull request #10170 from thaJeztah/docs-note-environment-vars
...
Document that ENV vars are not automatically updated
Upstream-commit: 04d1b93fce4789ad186b4762d94629c11c79ffbe
Component: engine
2015-01-20 10:04:25 +10:00
a9b7d25bb0
Merge pull request #10138 from ShockwaveNN/patch-1
...
fix link to introducion on 'Working with Docker Images' page
Upstream-commit: 27602f2a21732656180397cd4e30b9d246b75a0b
Component: engine
2015-01-19 10:53:15 -05:00
9f931ee8fa
Update the docs for --link accept container id
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 750373875e25455acb046001cb0582873a90bd73
Component: engine
2015-01-19 09:57:44 +08:00
86e0c72c59
Document that ENV vars are not automatically updated
...
Unlike the entries in `/etc/hosts`, environment-variables for linked
containers are not automatically updated if the linked container is
restarted.
This adds a note to the documentation in;
https://docs.docker.com/userguide/dockerlinks/#environment-variables
and
https://docs.docker.com/reference/run/#env-environment-variables
To make users aware that this is the case and recommends them to use
the `/etc/hosts` entries in stead.
I added this change because users were expecting environment variables
to be updated automatically as well (https://github.com/docker/docker/issues/10164 ).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3fb06dc104bb66c3ec7be8a95a33845310083999
Component: engine
2015-01-19 00:23:57 +01:00
a3290112e7
There was a missing command to re-run the web container.
...
Signed-off-by: Bruno Gazzera <bgazzera@paginar.com >
Upstream-commit: 44cde56333fe891e087b8aa5ba914345bbdedbc0
Component: engine
2015-01-18 12:17:49 -03:00
4f77faa073
fix link to introducion on 'Working with Docker Images' page
...
Old link go to Table of content page, but by context it should go to 'understaning-docker' pag
Signed-off-by: Pavel Lobashov <shockwavenn@gmail.com >
Upstream-commit: 43b97368422843108a2090633367beaba434245b
Component: engine
2015-01-16 14:16:10 +03:00
bafbcb6583
Add a note that remote and Boot2Docker users should not type sudo
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: d5df948829bfd6e12dc2c0ca3228b583386b6e87
Component: engine
2015-01-13 21:40:14 -05:00
87e9875e21
Merge pull request #9491 from SvenDowideit/note-that-volumes-in-b2d-are-special
...
Add a note to point out to new users that B2D bind-mounts are special-ish
Upstream-commit: 880aeab00df218322e246711578690c16312d2a4
Component: engine
2014-12-31 11:15:01 -08:00
45b07b768f
Add a note to point out to new users that B2D bind-mounts are special-ish
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: e52988528d20a729ed71e47e4d0a5fcb35c92dfc
Component: engine
2014-12-30 13:37:31 +10:00
5ac672fe9b
Talk up the 1.4 change to initialise volumes at time
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 1d4a13867053b58971424f8caf219f935fc66fdd
Component: engine
2014-12-30 13:08:53 +10:00
7959035342
Remove -t="" and -m="". Make -t and -m options consistent with help text and other documentation.
...
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: 8d7ee3697036d2d1f6c43efcb50b8d8b6c627584
Component: engine
2014-12-26 12:31:01 -05:00
912c56d931
add Scott's link checker script, and fix what it finds
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
2014-12-16 14:46:25 +10:00
c7729a9005
Merge pull request #9460 from shin-/docs_webhooks2
...
Webhooks documentation: additional improvements
Upstream-commit: 1e81a69618ea0c393ae80e52fcc0f446d462bd3e
Component: engine
2014-12-02 17:42:26 -05:00
d3e367d06e
Merge pull request #9273 from programmerq/dockerimages_hub
...
refer to the registry instead of the hub
Upstream-commit: 6a98ce2fc0f26730b9aa07a589806939d42c41f5
Component: engine
2014-12-02 17:15:04 -05:00
9cfd075a8d
Webhooks documentation: second pass addressing @fredlf's comments
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: bcef3535579b2e9a8f672626dd014b77ed44c5c0
Component: engine
2014-12-02 13:49:17 -08:00
624402f332
Update dockerimages.md
...
remove 'public registry'
Signed-off-by: Jeff Anderson <jeff@docker.com >
Upstream-commit: 46437d1a60278d1acfe32412f69b3c22749becf2
Component: engine
2014-12-02 10:48:39 -07:00
8414f519d4
Merge pull request #9321 from shin-/docs_webhooks2
...
Expanded documentation for Webhooks 2.0
Upstream-commit: 9aad1a7d10837f50eb7ff5ecf42bda7279fe889f
Component: engine
2014-11-29 02:11:38 -05:00
6915edc6f0
Merge pull request #9329 from acbodine/9296-dockervolume-doc-mount-behaviour-fix
...
Closes #9296 adds a more detailed note about the mount behavior with -v ...
Upstream-commit: 07e9ea86ca45313018eb1bc8c959ae17867fabb1
Component: engine
2014-11-27 00:22:19 -05:00
64a25db4b7
Expanded documentation for Webhooks 2.0 (chains and callbacks information)
...
Signed-off-by: Joffrey Fuhrer <joffrey@gmail.com >
Upstream-commit: c83cd5c7ac6dca270ef77adbca0be63441573c91
Component: engine
2014-11-25 22:22:04 +01:00
e165ded13e
Closes #9296 adds a more detailed note about the mount behavior with -v flag
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: efb8e8a34550b80a567e7b69ad6bb2644d5a9b09
Component: engine
2014-11-24 23:41:49 -08:00
995880b42a
Fix typos in the user guide main page
...
Signed-off-by: Joel Friedly <joelfriedly@gmail.com >
Upstream-commit: 2d2b3535cae11d02573d12297d34e9a98a3e984a
Component: engine
2014-11-21 03:17:00 +00:00
b38288b6f1
refer to the registry instead of the hub
...
Signed-off-by: Jeff Anderson <jeff@docker.com >
Upstream-commit: 7b20c1fd1877dc91abfbf6fd57e1f16e3b44c1e0
Component: engine
2014-11-20 16:54:46 -08:00
a56997089b
Corrected description of --sig-proxy
...
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.
Signed-off-by: Michal Minar <miminar@redhat.com >
Upstream-commit: e71f241c4b8006f097e4c63f7b3ea28d4591ddee
Component: engine
2014-11-13 10:50:06 +01:00
7b7fbcfc68
Fix typo in Docker Links chapter of User Guide
...
Upstream-commit: 932cc230814ba642c493c77d05932f63c0ef3e7f
Component: engine
2014-11-09 23:23:45 +03:00
e4bc9907a8
Merge pull request #8915 from gDD/patch-1
...
Remove extra line feed typo
Upstream-commit: 387c892126534a12d8dccffaed8c8a8f5f2548b8
Component: engine
2014-11-05 08:22:09 +01:00
