06d2c99583
Merge pull request #12225 from chenhanxiao/commit-accent
...
docs: add missing accent mark around docker command
Upstream-commit: c77ac8e29dab500f00831e72949648004fcd4d74
Component: engine
2015-04-09 11:34:07 -07:00
a3cc1fb41c
docs: add missing accent mark around docker command
...
As we did everywhere.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: 809d99ad913fd73ae5da637c26f94879a6eb189c
Component: engine
2015-04-09 04:37:23 -04: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
c4fa112c81
Adding environment variables for sub projects
...
Fixes issue #12186
Fixing variables per Jess
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ef8b917fac0b3d98146cadd890234d9179ae2021
Component: engine
2015-04-08 12:23:50 -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
f1afc0b3d1
Merge pull request #12154 from moxiegirl/carry-pr-11409
...
Carrying 11409 for a contributor
Upstream-commit: 8b7193057038d880be04d64e3470cdde30eb9218
Component: engine
2015-04-07 15:00:26 -07: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
5ce261de6c
Carrying 11409 for a client
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: fdfc36db416663e3c8434c031e01bd6211ce5d8b
Component: engine
2015-04-07 13:20:17 -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
42264ee36e
Merge pull request #12020 from chenhanxiao/docker-import-commit
...
docs: keep the style of docker-commit consistent with docker-import
Upstream-commit: 96c3141fa5c81e3d672215d5bfcfb7534e96af2f
Component: engine
2015-04-06 09:47:47 -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
007282bfc1
Merge pull request #12017 from moxiegirl/distribution-man-pages
...
Updating with man pages for distribution
Upstream-commit: 12e77875407f4a4368f198d28d1fadc2c676401c
Component: engine
2015-04-03 09:55:08 -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
e2ab7dec3a
Update userguide/dockervolumes - fixes issue #12052
...
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me >
Upstream-commit: 57b09068efe3a278145683ff05b5e352ee00bba3
Component: engine
2015-04-03 14:07:51 +03:00
c9d7b160f7
minor edits.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Upstream-commit: 8c578b8190a9abd5a48efa723878a12568f91e54
Component: engine
2015-04-03 14:43:21 +08: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
5eb5b13997
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 >
Upstream-commit: 8fa03df8850c6eb3ecdce1266c72ed8d7af3a5bb
Component: engine
2015-04-02 05:01:14 -04:00
2fbe877abc
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 >
Upstream-commit: b6d55ebcbc93ce66aa9906aa87e1081f21ba1650
Component: engine
2015-04-01 21:02:19 -07:00
0b52fe32d3
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 >
Upstream-commit: 37c7f3a2046dc01c6c58ed64638faf136dd0682c
Component: engine
2015-04-02 01:48:28 +02:00
2f0180cd18
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 >
Upstream-commit: 1a4d2a5c8b4b130e93c652743bab4547b8bf9aba
Component: engine
2015-04-01 14:24:53 -07: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
