docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
42,625 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

100 Commits

Author SHA1 Message Date
John Mulhausen 5435bfd362 Update device-mapper-driver.md 2016-10-21 14:31:30 -07:00
Thomas Sjögren f2f8532ca9 fix storage-driver-options 404 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2016-10-21 15:50:11 +02:00
Misty Stanley-Jones e4a2991808 Merge pull request #146 from mstanleyjones/faq_rhel_version 
Update the FAQ for RHEL and Windows
 2016-10-20 11:32:47 -07:00
Misty Stanley-Jones e442a215b6 Update the FAQ for RHEL and Windows 
RHEL 6.5 is not supported
Windows info was way out of date
 2016-10-20 11:31:07 -07:00
Misty Stanley-Jones 717d64348b Additional information about scaling a service 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-20 11:03:36 -07:00
Joao Fernandes 67cca0c72e Merge pull request #281 from konstruktoid/admin_ansible 
add engine/admin/ansible/
 2016-10-20 10:24:17 -07:00
John Mulhausen bd630e9e3b Update dockerlinks.md 2016-10-19 22:53:52 -07:00
John Mulhausen 60c9df35d9 Merge pull request #282 from mstanleyjones/add_macvlan_to_toc 
Add get-started-macvlan.md to TOC
 2016-10-19 22:51:38 -07:00
Misty Stanley-Jones d92715537f Merge pull request #230 from afrazkhan/master 
Info about IP 50 needing to be open
 2016-10-19 14:52:10 -07:00
Misty Stanley-Jones cdaef772f8 Merge pull request #125 from sicwolf/patch-1 
Wrong destination folder in container
 2016-10-19 14:50:31 -07:00
Misty Stanley-Jones 9c1de966a7 Add get-started-macvlan.md to TOC 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-19 13:45:14 -07:00
Thomas Sjögren 5d9da643d6 add engine/admin/ansible/ 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2016-10-19 22:02:26 +02:00
John Mulhausen bb793f22d0 Merge pull request #175 from dsheets/patch-1 
Engine reference BUILD tarball contexts mangled
 2016-10-19 10:43:46 -07:00
John Mulhausen fdb632d304 Merge pull request #265 from liubin/liubin-patch-1 
fix markdown syntax issue
 2016-10-19 10:42:41 -07:00
John Mulhausen 8b0e8bd12f Fix for issue #273 2016-10-19 10:41:34 -07:00
John Mulhausen 41f871d884 Merge pull request #275 from dvoytik/patch-1 
docs: add one missing blank and remove double blanks
 2016-10-19 10:37:19 -07:00
Misty Stanley-Jones a8ab9ee8fb Fix markdown error introduced in #261 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-19 09:29:24 -07:00
Dmitry Voytik 323259f2c4 add one missing blank and remove double blanks 
add one missing blank and remove double blanks
 2016-10-19 17:43:14 +02:00
Sebastiaan van Stijn f40170a796 Merge pull request #261 from mstanleyjones/167_clarify_apt_repo 
Clarify how to verify the APT source
 2016-10-18 18:03:16 -07:00
John Mulhausen f8776699de Merge pull request #223 from danix800/fix-typos 
Fix typos.
 2016-10-18 16:31:21 -07:00
Misty Stanley-Jones b0c831bd0b Clarify how to verify the APT source 
Fixes #167

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 15:40:33 -07:00
Danny Garcia 543f7ca548 Correct YAML frontmatter to reflect deprecation of boot2docker 2016-10-18 18:39:06 -04:00
John Mulhausen cc60beb64d Formatting fixes 2016-10-18 13:00:10 -07:00
Bin Liu 40eef2da44 fix markdown syntax issue 
The markdown issue generated a strange html page at https://docs.docker.com/engine/reference/commandline/swarm_leave/
 2016-10-19 01:29:15 +08:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS 
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 09:21:09 -07:00
Ding Fei bab82e94f6 Fix typos and updated a few links, some sentences. 
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
 2016-10-18 17:04:10 +08:00
Afraz Ahmadzadeh dcfbf407b0 Typo in docs 2016-10-18 07:58:08 +02:00
Sebastiaan van Stijn fc6db798d1 Merge pull request #232 from milindchawre/doc-change 
Fixes #26818 : Removing bad reference in docker volumes tutorial
 2016-10-17 16:51:46 -07:00
milindchawre 9ce069647a Fixes #26818 : Removing bad reference in docker volumes tutorial 
Signed-off-by: milindchawre <milindchawre@gmail.com>
 2016-10-17 11:54:32 +00:00
Afraz Ahmadzadeh 0dcdc43cb1 Info about IP 50 needing to be open 2016-10-17 10:29:28 +02:00
yuexiao-wang adbe6d1dac Fix the command and typo for trust_sandbox 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-14 17:35:13 +08:00
drlukeangel d0eaa59c88 Small update to the scale documentation (#142) 
* Small update to the scale documentation

Just a small update to make it a bit clearer with a bit more functionality.
 2016-10-13 08:57:33 -07:00
Misty Stanley-Jones 2ea55d74ad Provide a backup for old config when configuring devicemapper (#149) 
* Provide a backup for old config when configuring devicemapper

* Adding blank line to avoid rendering issues
 2016-10-12 15:44:18 -07:00
David Sheets 7b41a45abe Engine reference BUILD tarball contexts mangled 
Closed code fence, removed duplicate text. Perhaps caused by bad merge?
 2016-10-12 12:23:12 +01:00
Misty Stanley-Jones 232043cfa6 Merge pull request #148 from mstanleyjones/swarm_add_node_clarify 
Clarify what happens when a failed swarm node recovers
 2016-10-11 16:14:52 -07:00
Misty Stanley-Jones 62f4a04e39 Clarify what happens when a failed swarm node recovers 
Fixes #105
 2016-10-11 16:13:04 -07:00
Misty Stanley-Jones 6955815d23 Merge pull request #111 from yuj/patch-1 
Update restart.md
 2016-10-11 15:53:52 -07:00
Ben Firshman e4dfc61fab
Update Go client to docker/docker/client 
This has moved from docker/engine-api.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-10-11 13:59:27 +02:00
John Mulhausen 2b6cbd8255 Merge pull request #150 from BSCheshir/patch-2 
node1
 2016-10-11 01:39:48 -07:00
John Mulhausen fd905d3b26 Merge pull request #124 from RStrydom/patch-1 
Update step_four.md
 2016-10-11 01:26:45 -07:00
John Mulhausen 1dc817611b Formatting fixes 2016-10-11 01:24:55 -07:00
John Mulhausen 0937284ec7 Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-10-11 01:10:21 -07:00
John Mulhausen ac39558cb1 Formatting fix 2016-10-11 01:10:13 -07:00
John Mulhausen 9ee229caca Update index.md 2016-10-11 01:02:07 -07:00
Water Wang 96eec5a7b9 Update dockervolumes.md - Changed all wrong /opt/webapp 
Changed all wrong /opt/webapp as /webapp

/opt/webapp of web container includes app.py, if set destination folder as /opt/webapp, app.py is not visible and below error log presents and the web container will exit, so it's better to set the destination folder as /webapp.

docker logs -f web
python: can't open file 'app.py': [Errno 2] No such file or directory
 2016-10-11 09:54:25 +08:00
Misty Stanley-Jones e916f7f88e Change 'draft: true' to 'published: false' for Jekyll 2016-10-10 16:19:47 -07:00
Misty Stanley-Jones a41d952d78 Merge pull request #117 from mbentley/add-deferred-deletion 
Add deferred deletion to recommended dm options
 2016-10-10 15:52:42 -07:00
Misty Stanley-Jones f0b832357f Merge pull request #141 from mstanleyjones/choosing_port_vs_automatic 
Fix incorrect information about swarm port assignment
 2016-10-10 15:32:12 -07:00
Matt Bentley 5423de94f0
Add deferred deletion to recommended dm options 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-10-10 18:05:11 -04:00
BSCheshir a1edd7ce09 node1 
little bit before
ID                         NAME      IMAGE  NODE   DESIRED STATE  CURRENT STATE               ERROR
63s86gf6a0ms34mvboniev7bs  my-web.1  nginx  node1  Running        Running 58 seconds ago
 2016-10-11 01:40:51 +04:00