6fd02194d0
Merge pull request #12289 from sunyuan3/docker_remote_api
...
update docker_remote_api_v1.19.md
Upstream-commit: e3dd323336904c02aaf57a1ffe3dcc8cb666fc78
Component: engine
2015-04-11 09:27:36 -05:00
933c2653a0
Merge pull request #12288 from sunyuan3/ubuntu
...
update ubuntulinux.md
Upstream-commit: 6d8102466a2b6af569aaa4e12bb0c66b0ff3594a
Component: engine
2015-04-11 09:25:55 -05:00
dd126faafc
update docker_remote_api_v1.*
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 4f492e794ae9c9a51edae4bb5873187eadab828e
Component: engine
2015-04-11 18:11:49 +08:00
d555f3e70e
'docker rmi -f IMAGE_ID' untag all names and delete the image
...
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:
*untag all names and delete the image
*add test to this feature
*modify commandline/cli.md to explain this
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
2015-04-11 09:24:21 +08:00
7bfb104972
update ubuntulinux.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a8fddbdeae6dfb8f6366cc476b37c84ed49f2732
Component: engine
2015-04-11 08:58:23 +08:00
44fddcaf4b
Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required
...
devmapper: udev sync is a requirement
Upstream-commit: 23c12dabbdb7f895f606bbf2438599d29c53df3a
Component: engine
2015-04-10 16:52:38 -04:00
d89c51c3b5
devmapper: storage-opt override for udev sync
...
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.
Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.
Including link to the docs for users that encounter this daemon error
during an upgrade.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0e21782de5c038dfa3cfdfc7655b9e6b143baa7b
Component: engine
2015-04-10 15:43:16 -04:00
8c9e796ec1
Merge pull request #12218 from draghuram/apidoc_12055
...
Adds example request and Json parameter information for container
Upstream-commit: 6ab4878a015cecfc26426a9a9704ea04ac04666e
Component: engine
2015-04-10 11:22:57 -07:00
fdca34bdb1
Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
...
cli: Better wording for daemon --log-driver
Upstream-commit: 7cec5f50c51d91660c5b2ea2f4a9cf4dc6762b82
Component: engine
2015-04-10 08:29:29 -07:00
41fc757124
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 202e0380f36be93ace139cb52e6c4752d195a034
Component: engine
2015-04-10 11:10:41 -04:00
5ed91523df
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
2015-04-09 21:29:42 -04:00
3ee56a6e4d
Refine document by review comments
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
Upstream-commit: 8d682bf734539ade2d618349f82b8b5e83a87167
Component: engine
2015-04-09 21:29:42 -04:00
807d6f107a
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
2015-04-09 21:29:41 -04:00
3054fd5405
Docs cleanup - Contributor Guide
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: e4addf1c016dd4b6510e17e3f0d23032f880ba6f
Component: engine
2015-04-09 14:20:03 -07:00
bc679a5419
cli: Better wording for daemon --log-driver
...
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.
Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: a4b7a9e1e5505983aea3f6d7e246c57a6f4f6170
Component: engine
2015-04-09 02:12:44 -07:00
a981a686fa
docs: Markdown format fix around LogConfig param
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: b66597eef18a02014e0b634dc3dc55dff3de4c20
Component: engine
2015-04-08 16:16:37 -07:00
aa0ffa1114
Merge pull request #11855 from nfirvine/master
...
Add some new graphics for mac installation with boot2docker
Upstream-commit: 26e83832c7cdffcc6547972f10b3f8d85497fa85
Component: engine
2015-04-08 10:41:50 -07:00
eeb5b1ee1d
Merge pull request #12176 from YanFeng-Adam/typo
...
Fix a typo in /doc/sources/reference/run.md
Upstream-commit: ebc1e5ec9f25ba176bd30e08a26cb904d8009017
Component: engine
2015-04-08 10:08:05 -07:00
1ba10c92c9
Merge pull request #12178 from fschindler/fix-typo
...
Fixing typo.
Upstream-commit: b8a7fdade6351fc2201f8e7ca9b9416782852c4d
Component: engine
2015-04-08 09:10:53 -07:00
49086235ff
Merge pull request #12133 from xiaods/fixed-issue-11500
...
fixed #11500 Add tip about filter proxy
Upstream-commit: 254d6f7752dc325abe9e4a25fc80ab7887c72fde
Component: engine
2015-04-08 09:09:54 -07:00
c745cf0be5
Fix a typo in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
Upstream-commit: 64fd944e30c8c045f6d998cc5ca950ea272541b5
Component: engine
2015-04-08 11:23:47 -04:00
b29d9ea376
Fixing typo.
...
Added missing white space.
Signed-off-by: Felix Schindler <fschindler@weluse.de >
Upstream-commit: 8afd5cad317920cceed7536d278974d9251b0325
Component: engine
2015-04-08 11:03:11 +02:00
bc64528286
fixed #11500 Add tip about filter proxy
...
fixed #11500
Add tip about filter proxy to Docker installation Guides
Signed-off-by: Deshi Xiao <xiaods@gmail.com >
Upstream-commit: a40f37987859327c33643bb12067e3ece9e3294f
Component: engine
2015-04-08 14:13:01 +08:00
c4ee31b99c
Merge pull request #12156 from moxiegirl/pr-12008-carry
...
Carry PR 12008 for contributor
Upstream-commit: 65ca20e6f1ee74c3b6b786873d5b7b213d21a0d1
Component: engine
2015-04-07 14:54:02 -07:00
27dad5da53
Carry PR 12008 for contributor
...
Closes #8040
Remove a tic for the hawk
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 87e70b6831386775a0d6c6b952c947865f1d053b
Component: engine
2015-04-07 14:09:53 -07:00
8dfe9e8a9b
Merge pull request #11947 from TonnyXu/master
...
Updated the explanation of ONBUILD in best-practices doc
Upstream-commit: 9dd23be563be63b8dc3cf0ffda696cdf558f82fd
Component: engine
2015-04-07 16:53:43 -04:00
c9ca56fbcb
Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert
...
Replaced level with layer for OSI model references
Upstream-commit: 4d4f201a4d453501dbe1fc049abad98c4933b237
Component: engine
2015-04-07 13:29:40 -07:00
cb57509d97
Fix 2 typos in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
Upstream-commit: 805f34bb5b6f639b3eb361672af2cbc7437e2ce9
Component: engine
2015-04-07 14:15:05 -04:00
4b42a60c0f
Replaced level with layer for OSI model references
...
- ty to @moxiegirl for the info workflow for patching images.
-link to the v6 svg (grey L2 switch in the top /level/layer/)
http://docs.master.dockerproject.com/article-img/ipv6_switched_network_example.svg
Signed-off-by: Brent Salisbury <brent.salisbury@docker.com >
Upstream-commit: 7165089f34a1ff6d1c350dcd46bdcef15667cab1
Component: engine
2015-04-06 22:23:40 -04:00
d62565ffca
Revert "Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY."
...
COPY was not deprecated.
This reverts commit 3148063af16e5c14ea543f615d136f477a4e9537.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: d2992c78dc1f71b0844b3c17d5ea9be8fff8b15e
Component: engine
2015-04-06 15:34:10 -04:00
a0e29b0a30
Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update
...
Updated the dockerfile best practice section on ADD and COPY
Upstream-commit: 2c44556ff9d94ddeca09349c8c4669a47cfe22fb
Component: engine
2015-04-06 11:43:50 -07:00
84e28d150d
Merge pull request #12055 from l0kix2/patch-1
...
Improved "start a container" section 1.16 & 1.17 API docs
Upstream-commit: ce18734c2cffebe112d06dca9117150ceaa08e15
Component: engine
2015-04-06 11:41:38 -07:00
142a5765d0
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
2015-04-06 11:11:31 -07:00
ea1fc2ed3e
Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY.
...
Signed-off-by: malnick <malnick@gmail.com >
Upstream-commit: 3148063af16e5c14ea543f615d136f477a4e9537
Component: engine
2015-04-06 10:04:42 -07:00
a65903a8b7
Merge pull request #12100 from draghuram/docker_update
...
Add the missing option to the wget command for updating Docker.
Upstream-commit: 3e077bb3f73c4effa3135851811b23f1292ebe24
Component: engine
2015-04-06 10:03:23 -07:00
07de27cc12
Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
...
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
Upstream-commit: d489b91aa94a6e15d7d1daa953468cac9866f218
Component: engine
2015-04-06 09:23:53 -07:00
403c32d670
fix typo in cli.md
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 71de711189659847ea18313b7b0a57703960d0da
Component: engine
2015-04-06 16:11:40 +08:00
c201586780
Add the missing option to the wget command for updating Docker.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 9287e70c127b00bddb5a8d49f5ca97c19ac0614b
Component: engine
2015-04-05 23:00:21 -04:00
42748e46e4
fix the space thing.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Upstream-commit: 5057d7da132c287d52749b6c73a9cd6129a1c05a
Component: engine
2015-04-06 09:00:59 +08:00
828102e65e
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 >
Upstream-commit: ac12c8053779d36409e248f41c4d80ef0e4fbe9f
Component: engine
2015-04-04 11:23:49 +03:00
1d80656252
Updated the explanation of ONBUILD in best-practices doc
...
Signed-off-by: Tonny Xu <tonny.xu@gmail.com >
Upstream-commit: e50636617f10f4a2ca4924260cb67719bf906ec1
Component: engine
2015-04-04 12:46:25 +09:00
dd79c80fbf
Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update
...
docs: Add new windows installation tutorials
Upstream-commit: 4d571257edf628a42e54885befc63a7374aab3be
Component: engine
2015-04-03 20:39:21 +00:00
02c373c0f8
Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter
...
docs: fix bullet list and missing label filter
Upstream-commit: fb1e10284bb04b29c21357675374fdd27a8ff3e4
Component: engine
2015-04-03 12:33:22 -07:00
d54d64d3e2
Merge pull request #12003 from sleinen/patch-1
...
Make explanation consistent with command
Upstream-commit: a6c04f33e141527b24dc373a68ed62e2201803a0
Component: engine
2015-04-03 12:19:37 -07:00
f8af71c0cf
Merge pull request #12057 from icecrime/11925_carry
...
Specify running `boot2docker ip` on host
Upstream-commit: 6d5a0ac11ea50cd46d6f04435e49bb1b08bd0d60
Component: engine
2015-04-03 12:11:53 -07:00
bf961698dc
Merge pull request #12054 from eluck/master
...
Update userguide/dockervolumes - fixes issue #12052
Upstream-commit: 3985dc299a5958481a9c0dcbd3bc7da69de6a19b
Component: engine
2015-04-03 18:58:52 +00:00
4514e9e241
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 >
Upstream-commit: 2b320a230979c3222162567b9d1d3193b0806cd5
Component: engine
2015-04-03 11:33:34 -07:00
8827ee42d2
Specify running boot2docker ip on host
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bcbdf77ddb7dab0bf6346400eeb6a0aaaf3d7142
Component: engine
2015-04-03 08:53:44 -07:00
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
