centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-30 07:48:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,710 Commits 54 Branches 28 Tags
2c24a8a4ea7ea0571cd4e125158fa59f584d2464
Commit Graph

3401 Commits

Author SHA1 Message Date
Michael Crosby
6fa2a1e486 Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
 2015-04-13 13:32:45 -07:00
James Turnbull
e29dcd91bd Merge pull request #12228 from bboreham/12022-signal-doc 
Add a note about PID 1 not terminating automatically on signal
 2015-04-13 14:41:07 -04:00
Bryan Boreham
5ad15479a0 Add a note about PID 1 not terminating on SIGINT/SIGTERM. 
Also re-arranged the description of CTRL-c to make it clearer.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2015-04-13 17:39:38 +01:00
Eric Windisch
ac65c8c380 HTTPS URLs for docs top-level & man pages 
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-04-11 13:43:26 -04:00
James Turnbull
e3dd323336 Merge pull request #12289 from sunyuan3/docker_remote_api 
update docker_remote_api_v1.19.md
 2015-04-11 09:27:36 -05:00
James Turnbull
6d8102466a Merge pull request #12288 from sunyuan3/ubuntu 
update ubuntulinux.md
 2015-04-11 09:25:55 -05:00
jianbosun
d6d8f45b04 change memory usage display 
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
 2015-04-11 20:04:34 +08:00
Yuan Sun
4f492e794a update docker_remote_api_v1.* 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-11 18:11:49 +08:00
Deng Guangxing
795a58fb44 '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>
 2015-04-11 09:24:21 +08:00
Yuan Sun
a8fddbdeae update ubuntulinux.md 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-11 08:58:23 +08:00
moxiegirl
f3e1178791 Merge pull request #12272 from nathanleclaire/bots_are_our_friends 
Allow SEO crawling from docs site
 2015-04-10 15:58:37 -07:00
Nathan LeClaire
de03f4797b Allow SEO crawling from docs site 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com> (github: nathanleclaire)
 2015-04-10 15:29:55 -07:00
Tibor Vass
23c12dabbd Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required 
devmapper: udev sync is a requirement
 2015-04-10 16:52:38 -04:00
Vincent Batts
0e21782de5 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>
 2015-04-10 15:43:16 -04:00
moxiegirl
6ab4878a01 Merge pull request #12218 from draghuram/apidoc_12055 
Adds example request and Json parameter information for container
 2015-04-10 11:22:57 -07:00
Arnaud Porterie
7cec5f50c5 Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword 
cli: Better wording for daemon --log-driver
 2015-04-10 08:29:29 -07:00
Raghuram Devarakonda
202e0380f3 Adds example request and Json parameter information for container 
start API.

Closes #10304.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-04-10 11:10:41 -04:00
Tibor Vass
fa2ace00a8 Rebase + some fixes 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-09 21:29:42 -04:00
David Young
8d682bf734 Refine document by review comments 
Signed-off-by: David Young <yangboh@cn.ibm.com>
 2015-04-09 21:29:42 -04:00
David Young
bf57339527 Add comment column in docker history command output 
Signed-off-by: David Young <yangboh@cn.ibm.com>
 2015-04-09 21:29:41 -04:00
Megan Kostick
e4addf1c01 Docs cleanup - Contributor Guide 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-09 14:20:03 -07:00
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
Ahmet Alp Balkan
a4b7a9e1e5 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>
 2015-04-09 02:12:44 -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