centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-30 15:58:53 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,583 Commits 54 Branches 28 Tags
eebfcde0ea459bc9100ddde4b3c4e13a06a472cc
Commit Graph

3379 Commits

Author SHA1 Message Date
Jessie Frazelle
c77ac8e29d Merge pull request #12225 from chenhanxiao/commit-accent 
docs: add missing accent mark around docker command
 2015-04-09 11:34:07 -07:00
Chen Hanxiao
809d99ad91 docs: add missing accent mark around docker command 
As we did everywhere.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-09 04:37:23 -04:00
Ahmet Alp Balkan
b66597eef1 docs: Markdown format fix around LogConfig param 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-08 16:16:37 -07:00
Mary Anthony
ef8b917fac Adding environment variables for sub projects 
Fixes issue #12186
Fixing variables per Jess

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-08 12:23:50 -07:00
moxiegirl
26e83832c7 Merge pull request #11855 from nfirvine/master 
Add some new graphics for mac installation with boot2docker
 2015-04-08 10:41:50 -07:00
moxiegirl
ebc1e5ec9f Merge pull request #12176 from YanFeng-Adam/typo 
Fix a typo in /doc/sources/reference/run.md
 2015-04-08 10:08:05 -07:00
Arnaud Porterie
b8a7fdade6 Merge pull request #12178 from fschindler/fix-typo 
Fixing typo.
 2015-04-08 09:10:53 -07:00
moxiegirl
254d6f7752 Merge pull request #12133 from xiaods/fixed-issue-11500 
fixed #11500 Add tip about filter proxy
 2015-04-08 09:09:54 -07:00
Yan Feng
64fd944e30 Fix a typo in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-08 11:23:47 -04:00
Felix Schindler
8afd5cad31 Fixing typo. 
Added missing white space.

Signed-off-by: Felix Schindler <fschindler@weluse.de>
 2015-04-08 11:03:11 +02:00
Deshi Xiao
a40f379878 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>
 2015-04-08 14:13:01 +08:00
moxiegirl
8b71930570 Merge pull request #12154 from moxiegirl/carry-pr-11409 
Carrying 11409 for a contributor
 2015-04-07 15:00:26 -07:00
moxiegirl
65ca20e6f1 Merge pull request #12156 from moxiegirl/pr-12008-carry 
Carry PR 12008 for contributor
 2015-04-07 14:54:02 -07:00
Mary Anthony
87e70b6831 Carry PR 12008 for contributor 
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 14:09:53 -07:00
Tibor Vass
9dd23be563 Merge pull request #11947 from TonnyXu/master 
Updated the explanation of ONBUILD in best-practices doc
 2015-04-07 16:53:43 -04:00
moxiegirl
4d4f201a4d Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert 
Replaced level with layer for OSI model references
 2015-04-07 13:29:40 -07:00
Mary Anthony
fdfc36db41 Carrying 11409 for a client 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 13:20:17 -07:00
Yan Feng
805f34bb5b Fix 2 typos in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-07 14:15:05 -04:00
Brent Salisbury
7165089f34 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>
 2015-04-06 22:23:40 -04:00
Tibor Vass
d2992c78dc 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 3148063af1.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-06 15:34:10 -04:00
moxiegirl
2c44556ff9 Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update 
Updated the dockerfile best practice section on ADD and COPY
 2015-04-06 11:43:50 -07:00
moxiegirl
ce18734c2c Merge pull request #12055 from l0kix2/patch-1 
Improved "start a container" section 1.16 & 1.17 API docs
 2015-04-06 11:41:38 -07:00
Arnaud Porterie
ed8d402851 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
 2015-04-06 11:11:31 -07:00
malnick
3148063af1 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>
 2015-04-06 10:04:42 -07:00
moxiegirl
3e077bb3f7 Merge pull request #12100 from draghuram/docker_update 
Add the missing option to the wget command for updating Docker.
 2015-04-06 10:03:23 -07:00
moxiegirl
96c3141fa5 Merge pull request #12020 from chenhanxiao/docker-import-commit 
docs: keep the style of docker-commit consistent with docker-import
 2015-04-06 09:47:47 -07:00
moxiegirl
d489b91aa9 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754 
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
 2015-04-06 09:23:53 -07:00
Deng Guangxing
71de711189 fix typo in cli.md 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-06 16:11:40 +08:00
Raghuram Devarakonda
9287e70c12 Add the missing option to the wget command for updating Docker. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-04-05 23:00:21 -04:00
Simei He
5057d7da13 fix the space thing. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-06 09:00:59 +08:00
Kirill SIbirev
ac12c80537 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>
 2015-04-04 11:23:49 +03:00
Tonny Xu
e50636617f Updated the explanation of ONBUILD in best-practices doc 
Signed-off-by: Tonny Xu <tonny.xu@gmail.com>
 2015-04-04 12:46:25 +09:00
Jessie Frazelle
4d571257ed Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update 
docs: Add new windows installation tutorials
 2015-04-03 20:39:21 +00:00
moxiegirl
fb1e10284b Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter 
docs: fix bullet list and missing label filter
 2015-04-03 12:33:22 -07:00
moxiegirl
a6c04f33e1 Merge pull request #12003 from sleinen/patch-1 
Make explanation consistent with command
 2015-04-03 12:19:37 -07:00
moxiegirl
6d5a0ac11e Merge pull request #12057 from icecrime/11925_carry 
Specify running `boot2docker ip` on host
 2015-04-03 12:11:53 -07:00
Jessie Frazelle
3985dc299a Merge pull request #12054 from eluck/master 
Update userguide/dockervolumes - fixes issue #12052
 2015-04-03 18:58:52 +00:00
Ahmet Alp Balkan
2b320a2309 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>
 2015-04-03 11:33:34 -07:00
moxiegirl
12e7787540 Merge pull request #12017 from moxiegirl/distribution-man-pages 
Updating with man pages for distribution
 2015-04-03 09:55:08 -07:00
Arnaud Porterie
bcbdf77ddb Specify running boot2docker ip on host 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 08:53:44 -07:00
moxiegirl
05753288c4 Merge pull request #11997 from tiborvass/carry-11926 
Carry 11926: Added information about accessing host directory on Windows.
 2015-04-03 06:43:38 -07:00
moxiegirl
da61228501 Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow 
Explain advanced contribution workflow more
 2015-04-03 06:41:49 -07:00
eluck
57b09068ef Update userguide/dockervolumes - fixes issue #12052 
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me>
 2015-04-03 14:07:51 +03:00
Simei He
8c578b8190 minor edits. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-03 14:43:21 +08:00
Tibor Vass
9707286a5c Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
 2015-04-02 08:25:49 -04:00
Chen Hanxiao
8fa03df885 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>
 2015-04-02 05:01:14 -04:00
Mary Anthony
b6d55ebcbc 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>
 2015-04-01 21:02:19 -07:00
Sebastiaan van Stijn
37c7f3a204 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>
 2015-04-02 01:48:28 +02:00
Nick Irvine
1a4d2a5c8b 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>
 2015-04-01 14:24:53 -07:00
Alexander Morozov
81f9b72c64 Bump API version and docs to v1.19 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-01 13:40:56 -07:00