docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
44,040 Commits 13 Branches 28 Tags 810 MiB
Commit Graph

44040 Commits

Author SHA1 Message Date
John Mulhausen 90819b7133 Merge branch 'master' of https://github.com/docker/docker.github.io 2016-11-28 15:00:23 -08:00
John Mulhausen c49c5ec2c6 Merge branch 'stefanwuthrich-patch-1' 2016-11-28 15:00:06 -08:00
John Mulhausen 526a9b90ab Fixing merge conflict 2016-11-28 14:59:56 -08:00
John Mulhausen 70617e697b Adding Yakkety to opening list 2016-11-28 14:58:10 -08:00
John Mulhausen 921964a17c s/sizes/size 2016-11-28 14:55:56 -08:00
John Mulhausen 0891e122cf Merge pull request #408 from yangyuqian/explain_downloaded_image_and_container_size 
Explain downloaded image and container sizes
 2016-11-28 14:55:08 -08:00
Misty Stanley-Jones 1bc1addd32 Merge pull request #300 from amincheloh/patch-1 
Update swarm/install-manual.md
 2016-11-28 14:53:31 -08:00
John Mulhausen 2e5892e4a5 Writerly changes 2016-11-28 14:52:55 -08:00
Misty Stanley-Jones cc166f9ac7 Merge branch 'master' into patch-1 2016-11-28 14:48:36 -08:00
John Mulhausen 03763b45b1 Merge branch 'SCBuergel-patch-1' 2016-11-28 14:44:31 -08:00
John Mulhausen 2f817e465b Fix merge conflicts 2016-11-28 14:44:22 -08:00
John Mulhausen a5bf14e5f9 Merge pull request #334 from mstanleyjones/run_reference_reorg 
Add topic about limiting container resources
 2016-11-28 14:37:10 -08:00
John Mulhausen d621663c6f Removing superfluous example command 2016-11-28 14:28:42 -08:00
John Mulhausen ace5a7a952 s/syntax/command 2016-11-28 14:27:55 -08:00
John Mulhausen 62c35fd46b Merge branch 'friism-patch-1' 2016-11-28 14:22:56 -08:00
John Mulhausen e44ca4b758 Fix merge conflicts 2016-11-28 14:22:14 -08:00
John Mulhausen 74523ae57d Metadata fix 2016-11-28 14:17:31 -08:00
John Mulhausen 6dc1e38a52 Merge pull request #732 from rvernica/patch-1 
Fix link to link_local_ips in docs
 2016-11-28 14:14:42 -08:00
Misty Stanley-Jones 554b2c9967 Pull distribution reference docs from upstream 2016-11-28 13:51:52 -08:00
Rares Vernica 2d813e26fd Fix link to link_local_ips 2016-11-28 13:40:17 -08:00
Joao Fernandes 52ec9c945d Merge pull request #730 from joaofnfernandes/dtr-typo 
Fix typo in DDC release notes
 2016-11-28 13:32:37 -08:00
John Mulhausen 4263edb41f Merge pull request #103 from mbentley/update-ubuntu-cs-engine-docs 
Add additional package for aufs support; fixes #74
 2016-11-28 13:23:25 -08:00
Joao Fernandes fa4b1dd3c8 Fix typo in DDC release notes 2016-11-28 13:13:12 -08:00
Misty Stanley-Jones f9897d3b43 Fix doubled period 2016-11-28 12:40:40 -08:00
Misty Stanley-Jones a9e535f3bd Merge pull request #610 from fbouliane/add-dns-host-to-instructions 
Add DNS SubjectAltName to certificate recipe
 2016-11-28 11:59:16 -08:00
John Mulhausen 2107bd3546 Merge pull request #728 from mstanleyjones/fix_doubled_words 
Fix some doubled words
 2016-11-28 11:50:56 -08:00
Joao Fernandes 39fdee9a2a Merge pull request #707 from banjot/patch-5 
Update Release Notes for DTR 2.1.1 released
 2016-11-28 11:36:10 -08:00
Misty Stanley-Jones 756f4d974c Fix some doubled words 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 11:32:17 -08:00
Joao Fernandes b673510ecf Update Datacenter offline install docs 2016-11-28 11:20:53 -08:00
John Mulhausen b1ce89daf2 Merge pull request #706 from friism/patch-3 
fix typos
 2016-11-28 01:11:48 -05:00
John Mulhausen 589486892e Merge pull request #721 from tf2manu994/patch-1 
Replace 'ls Dockerfile' with 'ls'
 2016-11-28 01:11:04 -05:00
Manmeet Gill 3bcd9b455c Replace 'ls Dockerfile' with 'ls' 
Running `ls Dockerfile`, if following the guide, would give you nothing. Dockerfile is not a directory.
Running `ls` would *return* `Dockerfile`.
 2016-11-27 16:44:36 +11:00
Yanqiang Miao bda7d072ec Completed metadata of the journald log driver 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-24 18:30:25 +08:00
Banjot S Chanana ba163f98f7 Update Release Notes for DTR 2.1.1 released 
Release Notes for DTR 2.1.1
 2016-11-23 22:46:54 -05:00
Michael Friis 6dd7554c0e fix typos 2016-11-23 17:17:51 -08:00
Sebastiaan van Stijn 4364535cfc Merge pull request #640 from mstanleyjones/203_dns_server_ubuntu 
Rewrites to Ubuntu installation
 2016-11-24 01:44:22 +01:00
Misty Stanley-Jones e5b7d6aee3 Merge pull request #705 from mstanleyjones/redirect_networking 
Add redirect for /articles/networking/
 2016-11-23 16:42:13 -08:00
Misty Stanley-Jones d0fb13dc13 Add redirect for /articles/networking/ 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-23 16:36:35 -08:00
Misty Stanley-Jones 718296c37d Rewrites to Ubuntu installation 
Fixes #203
 2016-11-23 16:11:57 -08:00
Misty Stanley-Jones a4b2357e14 Clarification about flocker driver (#626) 
* Clarification about flocker driver

Fixes #324
 2016-11-23 15:42:34 -08:00
LRubin eeace80825 Merge pull request #698 from sanscontext/more-d-id 
remove some unneeded text with new Docker ID topic
 2016-11-23 13:09:11 -08:00
Misty Stanley-Jones c38dc6cfe2 Merge pull request #578 from docker/mstanleyjones-patch-2 
Add disclaimer about standalone swarm in 1.12+
 2016-11-23 12:34:26 -08:00
Misty Stanley-Jones 8953d4a4b8 Add disclaimer about standalone swarm in 1.12+ 
Fixes #559
 2016-11-23 12:29:27 -08:00
Misty Stanley-Jones 013d8f09fd Merge pull request #631 from mstanleyjones/followup_link_flag 
Add a little more clarification about --link
 2016-11-23 12:28:04 -08:00
Alessandro Boch d3155b9482 About the docker_gwbridge network (#400) 
* About the docker_gwbridge network

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-23 12:21:33 -08:00
Misty Stanley-Jones 0fb5e646a6 Update 'Working with networks' topic 
Verify all the steps, make modifications where necessary
Rewrite for grammar and clarity
Add explanation for unclear sections
Adapt some sections to a stepped tutorial style

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-23 12:09:13 -08:00
LRubin c23aa3a813 remove some unneeded text with new Docker ID topic 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-23 11:13:44 -08:00
John Mulhausen e105f0714a Merge pull request #693 from joelemmer/patch-1 
Update extends.md
 2016-11-22 17:32:57 -08:00
John Mulhausen 70bb36eb49 Merge pull request #680 from ananthulasrikar/master 
Updated the URL syntax in mark down at line 73
 2016-11-22 17:32:29 -08:00
Victoria Bialas 094981f4ba Merge pull request #697 from londoncalling/d4mac-deprecate-yosemite-10.10.x 
d4mac, added warning re:plan to drop support for OS X 10.10.x
 2016-11-22 16:12:30 -08:00