Commit Graph

273 Commits

Author SHA1 Message Date
Misty Stanley-Jones f39d909fdd Formatting 2016-10-25 11:40:39 -07:00
Misty Stanley-Jones 458ab09eed Formatting 2016-10-25 11:37:56 -07:00
Misty Stanley-Jones 8308f5eca6 Formatting 2016-10-25 11:27:16 -07:00
Misty Stanley-Jones 00511c620d Formatting 2016-10-25 11:19:12 -07:00
John Mulhausen e0760748dc Fix for #290 2016-10-24 18:50:01 -07:00
John Mulhausen 10b907190f Fix #332
Fix #332
2016-10-24 18:40:19 -07:00
John Mulhausen 74c1b60806 Merge pull request #323 from dusek/fix-gem2.0-not-found
dockerimages.md: fix "gem2.0: command not found"
2016-10-24 18:35:27 -07:00
John Mulhausen 03b2d5be51 Merge pull request #318 from weslord/master
Add aliases to engine/reference/ subdirs for backwards compatible links
2016-10-24 18:34:29 -07:00
Boris Dušek 641a2137bd dockerimages.md: fix "gem2.0: command not found" 2016-10-23 13:30:46 +02:00
weslord 076c060ddf Removed a space from Dockerfile Best Practices 2016-10-23 04:17:27 -07:00
weslord 8ac3830f70 Add aliases to engine/reference/ subdirs for backwards compatible links 2016-10-22 15:32:58 -07:00
John Mulhausen 25342006d9 Merge pull request #302 from krerkkiat/patch-1
Update archlinux.md so it renders section title correctly
2016-10-22 13:27:28 -07:00
John Mulhausen 802121e482 Merge pull request #309 from dgvigil/master
Moving sudo command after echo pipe for Ubuntu install
2016-10-22 13:25:47 -07:00
John Mulhausen 04c0220bc6 Merge pull request #299 from donaldali/patch-1
Remove duplicate `to` from glossary.md
2016-10-22 13:23:41 -07:00
John Mulhausen bd27f18e1c Merge pull request #316 from robeerob/patch-1
Update step_three.md due to Docker Hub changes
2016-10-22 13:19:20 -07:00
John Mulhausen 5415c33ea7 Merge pull request #311 from friism/patch-2
fix anchor
2016-10-22 13:17:53 -07:00
Robert Axelsen 8ca376c348 Update step_three.md due to Docker Hub changes
I went through the tutorial myself, and could not find any "Browse and Search" link to click on Docker Hub page. Update to reflect that this step is now superfluous.
2016-10-22 18:35:25 +02:00
4c74356b41 d24834fceb fixing typo 2016-10-22 12:37:05 +03:00
Michael Friis cd0f5c4888 fix anchor
Signed-off-by: Michael Friis friism@gmail.com
2016-10-21 17:00:25 -07:00
John Mulhausen 5435bfd362 Update device-mapper-driver.md 2016-10-21 14:31:30 -07:00
Vigil 8341768fd7 fix: Moving sudo command after echo pipe 2016-10-21 15:11:23 -06: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
Thomas Sjögren a61c5998f1 remove line numbers from caps link
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2016-10-21 15:23:36 +02:00
Krerkkiat Chusap 13e5fa3629 Update archlinux.md
Add newline before the Uninstallation section since it is displayed as the raw text (## Uninstallation) on the website.
2016-10-21 00:33:03 -04:00
Donald Ali 5095f84979 Remove duplicate `to` from glossary.md 2016-10-20 16:54:56 -07: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
John Mulhausen 4b71ffe966 Merge pull request #140 from candita/patch-1
Update deprecated.md
2016-10-10 11:42:32 -07:00
Misty Stanley-Jones 220bbed0e4 Fix incorrect information about swarm port assignment 2016-10-10 10:02:15 -07:00
candita b5ca8860b9 Update deprecated.md
Format as one sentence rather than 2 columns.
2016-10-10 11:46:51 -04:00
vishesh92 78ff6bf07e fix formatting in container-communication.md
fix formatting in container-communication.md so page is rendered perfectly at https://docs.docker.com/engine/userguide/networking/default_network/container-communication/
2016-10-10 17:58:48 +05:30
sicwolf 539f8aa082 Wrong destination folder in container
/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, 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-08 18:52:15 +08:00
Renier Strydom 6603c48cde Update step_four.md
It is not normal to provide the file you are looking for when running `ls`
2016-10-08 10:36:56 +02:00
John Mulhausen 8bfa1bda07 Merge pull request #114 from benizi/fix/raw-variables-targeted
Prevent Liquid from mangling `{{` in a more targeted way
2016-10-07 13:30:05 -07:00
John Mulhausen aab444d99b Update cloud-ex-machine-ocean.md 2016-10-07 12:51:16 -07:00
Andrew Starr-Bochicchio 3f7a061d99 Fix broken images in DigitalOcean examples. Closes: #118 2016-10-07 14:55:06 -04:00
John Mulhausen 4ab65ba3a4 Merge pull request #92 from dragonndev/master
Documentation Update
2016-10-06 22:26:52 -07:00
John Mulhausen d6794bf9fc Update trust_sandbox.md 2016-10-06 22:25:54 -07:00
John Mulhausen dec694d0d3 Update configure-dns.md 2016-10-06 21:59:42 -07:00
Benjamin R. Haskell 362e94b2bc Disable Liquid templating for blocks with `{{`
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
2016-10-07 00:58:08 -04:00
Benjamin R. Haskell 65ec3a3763 Revert pull request #48
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
2016-10-07 00:56:17 -04:00
John Mulhausen 1357a4486d Merge pull request #113 from mbentley/fix-devicemapper-docs
Fixed jekyll formatting for dm docs; fixed #112
2016-10-06 21:55:35 -07:00
Matt Bentley 73fac8acb7
Fixed jekyll formatting for dm docs; fixed #112
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-10-06 22:33:41 -04:00
John Mulhausen bdc4a3b934 Fix for Embedded DNS server 2016-10-06 17:12:47 -07:00
John Mulhausen a2ff02a96a Fix for relative-path redirects causing infinite loops 2016-10-06 17:00:03 -07:00
James Yu 0688247f2e Update restart.md 2016-10-06 14:19:47 -07:00
John Mulhausen cb3f6f04a1 Merge pull request #48 from benizi/fix/raw-variables
Fix formatting for Markdown files containing `{{`
2016-10-06 09:46:51 -07:00
John Mulhausen 32f3885686 Update log_tags.md 2016-10-06 09:39:32 -07:00
John Mulhausen 3d08488dc4 Update log_tags.md 2016-10-06 09:32:22 -07:00
BSCheshir 7fd3d4e956 fix url 2016-10-06 18:05:44 +04:00
Matthew Lapworth 6129e9d3f9
Updated documentation on using the trust sandbox to fix an issue where the notary server tag was not found.
Signed-off-by: Matthew Lapworth <matthewl@bit-shift.net>
2016-10-05 21:15:45 -07:00
John Mulhausen 154bc45ab7 Merge pull request #87 from emcniece/fix-build-markdown
Adding fix for builder reference markdown
2016-10-05 17:02:40 -07:00
Eric McNiece 8c6c5a0e63 Adding fix for builder reference markdown 2016-10-05 16:50:29 -07:00
John Mulhausen e0280abc9a Update plugin_api.md 2016-10-05 16:12:47 -07:00
John Mulhausen f6562cf92a Update last_page.md 2016-10-05 16:10:52 -07:00
John Mulhausen 5389e6cb12 Update https.md 2016-10-05 16:07:08 -07:00
John Mulhausen e41a76bf81 Fix for table in reference/run 2016-10-05 16:02:13 -07:00
John Mulhausen 790dbb4cf4 Update builder.md 2016-10-05 15:39:53 -07:00
John Mulhausen 6538eba35f Update glossary.md 2016-10-05 15:39:27 -07:00
John Mulhausen f913e2c573 Update index.md 2016-10-05 15:39:09 -07:00
John Mulhausen e8ddc58189 Update run.md 2016-10-05 15:38:02 -07:00
John Mulhausen 6e599e9d05 Update intro.md 2016-10-05 15:26:49 -07:00
John Mulhausen 40f16b311e Merge pull request #49 from benizi/fix/missing-code-fence
Add missing close tag for fenced code block
2016-10-05 10:32:31 -07:00
Vladimir Rutsky 210d261bb4 don't split verbatim text over few lines
Should fix improperly formatted documentation page.
2016-10-05 20:38:15 +04:00
Benjamin R. Haskell 57542590b3 Add missing close tag for fenced code block 2016-10-05 02:17:41 -04:00
Benjamin R. Haskell b3a620808a Fix formatting for Markdown files containing `{{`
They're usually examples of Go-style text templates.  But, Liquid templating is treating them as variable substitutions.  E.g., in `engine/reference/commandline/ps.md`:

```bash
$ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}"
```

is rendered as:

```bash
$ docker ps --filter volume=remote-volume --format "table \t"
```

Solution is to wrap entire files in `{% raw %} ... {% endraw %}` blocks.
2016-10-05 01:58:24 -04:00
John Mulhausen c03bb7f90c Update services.md 2016-10-04 16:59:05 -07:00
John Mulhausen bb83c5f605 Update rhel.md 2016-10-04 15:24:14 -07:00
Victoria Bialas 300486bd77 removed ubuntu wily 15.10 references in install docs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-04 12:37:39 -07:00
John Mulhausen a0ee6c6004 Rendering fixes, part 1 (up through cs-engine) 2016-09-30 19:38:30 -07:00
John Mulhausen 0133cb646d Merge pull request #21 from pborreli/typos
Fixed typos
2016-09-30 11:51:42 -07:00
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
John Mulhausen 99bab305bd Removing merge detritus 2016-09-29 23:38:12 -07:00
John Mulhausen 42964d8b7d Removing empty front-matter 2016-09-29 22:39:30 -07:00
Pascal Borreli 6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 9d5e59d503 Moved engine imported docs to the engine subdirectory 2016-09-29 11:19:31 -07:00