2aeb9859a8
Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall
...
Note that using -lxc-conf to change things Docker manages has pitfalls
Upstream-commit: 2525a04594eed2ca4e13e9ded83f406529bad299
Component: engine
2014-12-05 11:16:19 -08:00
8953683264
I was talking to someone whom i listen to, and she noted that our docs don't mention the license
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 522e6310967bcb4fadd99d76dc3205991ecae1ad
Component: engine
2014-12-05 21:06:11 +10:00
996111b8d3
Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc
...
Try out a different phrase for --icc
Upstream-commit: 8dfcbf62edb2853176eb3f5cf077dae68f2e85c3
Component: engine
2014-12-05 16:22:51 +10:00
49f85cd111
Merge pull request #9504 from davidmat/patch-1
...
Update Amazon EC2 Docker installation instructions
Upstream-commit: a10b0cd23f806944c7e5d6515cdbf07af49bad9b
Component: engine
2014-12-04 21:57:45 -08:00
d60bbfaec3
Merge pull request #9507 from jsternberg/docker-build-docs-formatting-fix
...
Fixing docs formatting for the forcerm flag on docker build
Upstream-commit: ebf89cf2198acd6953adabc24ffc44aaac5c0780
Component: engine
2014-12-04 21:54:14 -08:00
fbf4eeb228
Merge pull request #9464 from SvenDowideit/sven_tries_webhooks
...
Add some extra details to webhook docs
Upstream-commit: 84dc2c83cb208144763740f12354d3e37d9fa135
Component: engine
2014-12-04 19:44:26 -08:00
635b9dd208
Show image of the Build trigger screen, and add a little search engine fodder for it.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b266ad9c607588e8541926dfca7e338148e904ff
Component: engine
2014-12-05 13:05:38 +10:00
822c213004
Add some extra details to webhook docs
...
Update the webhook JSON payloads to real ones,
and show there is a difference between an automated build webhook payload and a normal repo payload
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: b4b899264ed892818ef31c3626acad8fb110aabb
Component: engine
2014-12-05 12:13:22 +10:00
e8f1ddbeb0
this v spacing irritated me while i was reading
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 11a75ec97f904b1807dbdc7121ac4e19dc229d49
Component: engine
2014-12-05 12:01:13 +10:00
6a592dd8e6
Auto-update documentation from the output of the cli.
...
I've re-jigged the run man page so that each option's text begins with the
cli's help text for that flag, and then ay subsequent lines in the man page
are carried forward.
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: e01baa6be782320d3c0800697c882c2b919b202f
Component: engine
2014-12-05 10:43:38 +10:00
82038e31a9
Update Amazon EC2 Docker installation instructions
...
The installation guide for EC2 is outdated, as the current version of Amazon Linux (2014.09) is now Docker ready. No need to go through the manual route anymore. The official AMI has Docker packages in the repository now (this was the 'pre-release' option in the outdated instructions).
Docker-DCO-1.1-Signed-off-by: David Mat <david@davidmat.com > (github: davidmat)
Upstream-commit: da667581cffec4048d848454266b8d3cad55c859
Component: engine
2014-12-04 21:02:29 +01:00
25e75bf1f1
Fixing docs formatting for the forcerm flag on docker build
...
Signed-off-by: Jonathan A. Sternberg <jonathansternberg@gmail.com >
Upstream-commit: eb7d646a44d76c4a7f96fa6ef28de9fbbbaf17ca
Component: engine
2014-12-04 12:35:31 -05:00
3b1609f4c6
Something changed, broke the docs release script, and it seems that --exclude still doesn't work, so I'm removing it
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 6d560e197ccde8f1d711ad8260cf399b078c404d
Component: engine
2014-12-04 16:10:55 +10:00
f3226b6931
Note that using -lxc-conf to change things Docker manages has pitfalls
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b91d330088958bca4e59285a55fdc5593d2a86ad
Component: engine
2014-12-04 11:49:06 +10:00
7930a900f5
Merge pull request #9486 from ClusterHQ/9484-fromSrc-api-docs
...
Document fromSrc more clearly
Upstream-commit: e15ffa45a670041ceee06c3b51dff177b5f3378f
Component: engine
2014-12-03 20:31:44 -05:00
e1ce0e0de9
Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create
...
Initialize volumes when container is created
Upstream-commit: 67fda331973fdd23f3da79588ea899dc577f46e8
Component: engine
2014-12-03 15:42:09 -08:00
3d5681303b
Update the most recent released version of the docs as well.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com >
Upstream-commit: 0888c1880f836703987313049100bad9ce821584
Component: engine
2014-12-03 17:14:08 -05:00
d3f88b9d6d
Talk about URL support and the real meaning of - in the latest fromSrc API documentation.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com >
Upstream-commit: 826f809d0959d59d4f478615be4dc9b7db7c46f1
Component: engine
2014-12-03 17:13:48 -05:00
576cfafbf2
Merge pull request #9426 from lhuard1A/overlay_rename
...
Rename overlayfs to overlay
Upstream-commit: 5d49d2bb7a3bafcd1481a05d56ebc39ecd394393
Component: engine
2014-12-03 10:57:42 -08:00
34e4a16b13
Rename the overlay storage driver
...
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`
Signed-off-by: Lénaïc Huard <lhuard@amadeus.com >
Upstream-commit: d680ca5c96484474757fb6f92274f47bf1520631
Component: engine
2014-12-03 13:57:23 +01:00
215ea5a487
fixes as per feedback
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 070a519a9b972ffffda62b82fbc27825d4a6f9b0
Component: engine
2014-12-03 12:46:23 +10:00
7045c111d6
Try out a different phrase for --icc
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 94d67d5d5b300c346e17503810d521c91db89c14
Component: engine
2014-12-03 12:46:23 +10:00
bef6ed45c4
80-char limit
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a74c12177f02be97730b83ded9521a14ba568bcd
Component: engine
2014-12-03 12:46:16 +10:00
291b777b81
Doc: described storage-driver options in cli reference
...
Documented --storage-opt=[] option in cli reference page. Content taken
from:
daemon/graphdriver/devmapper/README.md
Signed-off-by: Michal Minar <miminar@redhat.com >
Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com > (github: SvenDowideit)
Upstream-commit: a2aa78f6ec9e0a654f92c57336f8e487477d4040
Component: engine
2014-12-03 12:46:16 +10:00
001616e8bc
Man: describe storage options
...
Documented --storage-opt=[] option in man page. Content taken from:
daemon/graphdriver/devmapper/README.md
Signed-off-by: Michal Minar <miminar@redhat.com >
Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com > (github: SvenDowideit)
Upstream-commit: aa00ad47e243b41b863354e6360a5d3a46aa3212
Component: engine
2014-12-03 12:46:16 +10:00
d67f32cdc7
Man: describe --icc option better
...
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.
Signed-off-by: Michal Minar <miminar@redhat.com >
Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com > (github: SvenDowideit)
Upstream-commit: a61a4a31882335020cfbffc49ffe274847a5c803
Component: engine
2014-12-03 12:46:16 +10:00
a62f6a9d69
Merge pull request #9429 from sindhus/patch-1
...
Fix dead link in oracle.md
Upstream-commit: 70c4b4ededd5bfe2f67c7a0c687c80bd45fa2fba
Component: engine
2014-12-03 12:38:17 +10:00
2de1f2dd9b
Merge pull request #9430 from sindhus/patch-3
...
Fix dead link cli.md
Upstream-commit: 315520b8453d4d0d8cf6e3651a06804dc47a8736
Component: engine
2014-12-02 16:06:48 -08: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
3e14694b93
Merge pull request #9330 from TomasTomecek/master
...
docs: man docker-images: inconsistent naming
Upstream-commit: b487d2f2ff9562301c1e9a1e705876ff3e3f3c10
Component: engine
2014-12-02 11:42:29 +10:00
8985d88694
Fix dead link build.md
...
Upstream-commit: 7754ef1f064be08419bf397e2ea7e4ce99bdf90d
Component: engine
2014-12-01 19:35:58 +05:30
81cd0946d7
Fix dead link cli.md
...
Upstream-commit: b1dc0db56ac9a27d51ab2a3684ed398d7b80a80c
Component: engine
2014-12-01 19:28:02 +05:30
71ee90ecd5
Fix dead link in oracle.md
...
Upstream-commit: ffda2035e5a9e6a723c4c84cd5f88c5f4a9dc2ba
Component: engine
2014-12-01 19:07:04 +05:30
65d8f4630e
Fixes #9418 Docker Registry now open source
...
Signed-off-by: Neal McBurnett <neal@mcburnett.org >
Upstream-commit: 4bf72613fed9424356e2146d795ddbfa825befa4
Component: engine
2014-11-30 21:12:57 -07:00
0ed56d2477
Merge pull request #9194 from flavio/update_installation_docs
...
Update installation docs
Upstream-commit: 595cd5279e90f1225eb015708b3db5e2e8766c0f
Component: engine
2014-12-01 13:18:12 +10:00
7ad93db024
Cover openSUSE and SUSE Linux Enterprise on the same page
...
Updated the documentation to cover the installation of Docker on
openSUSE and on SUSE Linux Enterprise.
Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com > (github: flavio)
Upstream-commit: 47d8ec0a42ce2cd71a0275665f2e7d74a5a56cbf
Component: engine
2014-12-01 01:23:38 +01:00
50bc44d6da
Correct inaccuracy in docker pull documentation
...
Signed-off-by: Alexander Boyd <alex@opengroove.org >
Upstream-commit: eb8e84c48a8a20895b78299dbc2d8429d092be8d
Component: engine
2014-11-29 23:36:19 -07:00
b86446758b
Merge pull request #9332 from jacobat/patch-1
...
Update documentation for EXPOSE
Upstream-commit: 353ff40181276a0278b323e569cc887d0510ae69
Component: engine
2014-11-29 09:27:49 -05:00
af8a86ae0c
Update documentation for EXPOSE
...
The documentation for EXPOSE seems to indicate, that EXPOSE is only relevant in
the context of links, which is not the case.
Signed-off-by: Jacob Atzen <jatzen@gmail.com >
Upstream-commit: 8432224f0ef628b3da42def046e48f9635aa4b23
Component: engine
2014-11-29 15:18:18 +01:00
f423709e4f
Merge pull request #9335 from jamtur01/typo
...
Removed extraneous )
Upstream-commit: 0675d7bbbad9097534fa686ca12da967d8ebc9ad
Component: engine
2014-11-29 02:14:10 -05:00
2860ecd2f7
Merge pull request #9396 from a-ba/fix-docs-update
...
fixed regression in docs-update.py
Upstream-commit: 5336f4463030798aca14d6b685068138b298d521
Component: engine
2014-11-29 02:12:54 -05: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
ce7b0568fe
Merge pull request #9227 from SvenDowideit/add-client-ip-to-hosts
...
Add an example of how to add your client IP to the container hosts file
Upstream-commit: 2c97cc39958ab9e4d1432836a9e925dd03e87fad
Component: engine
2014-11-28 17:44:11 -08:00
d9b29f9a8d
Merge pull request #9337 from shishir-a412ed/deprecated-images-t-v
...
Removing description for 'docker images' -t and -v flags, since they are deprecated.
Upstream-commit: 11069f257f8169c1774e025fe9ffd6447dd1b900
Component: engine
2014-11-28 17:35:36 -08:00
2237d8acc8
Merge pull request #9347 from SvenDowideit/extract-systemd-docs
...
Extract the systemd docs from various places and add a little more
Upstream-commit: 6a4d4fb2f5f93b37d99f66f8190fe89cf2ad5f89
Component: engine
2014-11-28 17:12:00 -08:00
647ad41bc0
fixed regression in docs-update.py
...
17500eb renamed 'help' as 'help_string', but there was a miss
Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr >
Upstream-commit: 9f8c14026ce2ddf0f69eb7a416cfb56da5443032
Component: engine
2014-11-28 13:36:27 +01:00
f8672e482a
docs: man docker-images: inconsistent naming
...
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com >
Upstream-commit: 095027944f16205c1c75d47d2f60a7c1ac666bf1
Component: engine
2014-11-28 08:57:07 +01:00
