Commit Graph

45228 Commits

Author SHA1 Message Date
Victoria Bialas e36de21467 Merge pull request #1666 from londoncalling/update-voting-app-docs
clarified logging into a swarm manager to list nodes
2017-02-14 17:15:03 -08:00
Victoria Bialas db256b5deb clarified logging into a swarm manager to list nodes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-14 16:56:16 -08:00
Misty Stanley-Jones 93e64bb762 Merge pull request #1664 from mstanleyjones/liquid_errors
Add {% raw %} notation to a few codeblocks
2017-02-14 16:32:03 -08:00
Misty Stanley-Jones 7bc3323ab3 Add {% raw %} notation to a few codeblocks 2017-02-14 16:19:06 -08:00
French Ben 7c894d5fb1 Updated example to examples in yaml
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-14 15:04:51 -08:00
French Ben ff0e184ef3 Added examples parsing to liquid template
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-14 14:47:44 -08:00
French Ben a1933d276b New CLI added
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-14 14:30:56 -08:00
Misty Stanley-Jones 96338d0ea9 Merge pull request #1655 from scjane/patch-1
Update step_six.md
2017-02-14 11:57:13 -08:00
Misty Stanley-Jones 7b058997e7 small fix 2017-02-14 11:43:38 -08:00
Misty Stanley-Jones e7300cf848 Merge pull request #1566 from mstanleyjones/1072_swarm_backup
Add info about backing up swarms
2017-02-14 11:37:59 -08:00
Misty Stanley-Jones 675ad92276 Overall edits
It's nice to be able to improve this content when we get a chance.
2017-02-14 11:33:06 -08:00
Misty Stanley-Jones 1346c7f56a Merge pull request #1657 from mathieui/engine-commandline-markdown
Fix a markdown rendering issue
2017-02-14 11:03:11 -08:00
Misty Stanley-Jones ed28bd1fc3 Merge pull request #1660 from dluc/patch-1
Fix broken links
2017-02-14 11:01:28 -08:00
Devis Lucato 73662f59cb Fix broken links
Fix the broken links at the bottom of https://docs.docker.com/compose/compose-file/ page
2017-02-14 10:47:06 -08:00
Misty Stanley-Jones be407562c0 Merge pull request #1658 from bkauf/patch-1
Default docker log name is container ID
2017-02-14 10:27:32 -08:00
Brian Kaufman 34b5b993ca Default docker log name is container ID
The default docker log name is the 12 character container ID, the sample test.conf setup above filters for Docker.* which will not pick anything up unless users start their containers with at "Docker" tag
2017-02-14 12:53:12 -05:00
mathieui 3e713f6359 Fix a markdown rendering issue
The first snippet for “Create a docker service with specific hostname” is not properly rendered in the official docs: https://docs.docker.com/engine/reference/commandline/service_create/#/create-a-docker-service-with-specific-hostname---hostname
2017-02-14 18:24:54 +01:00
scjane cc1ddf3c6d Update step_six.md 2017-02-14 17:29:30 +08:00
Misty Stanley-Jones 551b30f319 Add info about backing up swarms
A little reorganization and clean-up along the way
2017-02-13 17:19:45 -08:00
ben grissinger 58ad6a7119 Update upgrade.md 2017-02-13 16:56:12 -08:00
Misty Stanley-Jones 404fa2295a Merge pull request #1608 from joaquincasares/patch-1
Update index.md
2017-02-13 16:51:44 -08:00
Misty Stanley-Jones c5c892f293 Merge pull request #1615 from apihlaja/patch-1
Update digital-ocean.md
2017-02-13 16:51:04 -08:00
Misty Stanley-Jones 0b663b1042 Merge pull request #1616 from cliffwoolley/patch-1
Fix Markdown; no need to install curl twice
2017-02-13 16:49:43 -08:00
Misty Stanley-Jones 15980561e7 Merge pull request #1618 from cheuberg/patch-1
Fix markdown error
2017-02-13 16:48:51 -08:00
Misty Stanley-Jones faa469f4b7 Merge pull request #1619 from hoatle/patch-1
fix typo: redploy => redeploy
2017-02-13 16:48:17 -08:00
Misty Stanley-Jones 99767cb51f Merge pull request #1620 from shubheksha/patch-1
Fix minor typo in step_four.md
2017-02-13 16:47:15 -08:00
Misty Stanley-Jones 1d53a3c4d6 Merge pull request #1623 from shubheksha/patch-2
Update FAQ.md
2017-02-13 16:46:15 -08:00
Misty Stanley-Jones 4e9553176f Merge pull request #1630 from ifraixedes/patch-1
Fix yml file in compose alias example
2017-02-13 16:44:07 -08:00
Misty Stanley-Jones a178b5437f Merge pull request #1635 from joaofnfernandes/broken-link
Fix broken link
2017-02-13 16:43:13 -08:00
Misty Stanley-Jones 6cbbf69ca0 Merge pull request #1636 from shin-/v3-network-config
Remove unsupported IPAM config entries in v3
2017-02-13 16:41:58 -08:00
Misty Stanley-Jones 80449c6bdd Merge pull request #1637 from joshwyatt/patch-1
Correct misspelling
2017-02-13 16:41:19 -08:00
sarahlynnpark f0ed4d860d Add links to video overviews 2017-02-13 15:52:46 -08:00
Joao Fernandes a5d10942b4 Fix broken link 2017-02-13 15:42:50 -08:00
Nicola Kabar 45efe11bd4 updating template parameters and cli command
updating template parameters and launch cli to match D4AWS
2017-02-13 15:24:48 -08:00
Josh Hawn 322d9e667e [datacenter/ucp] Document RethinkDB Configuration
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-02-13 14:47:40 -08:00
Misty Stanley-Jones 3b6477ac4d Merge pull request #1640 from programmerq/patch-3
differentiate trusty and xenial in this step
2017-02-13 13:31:01 -08:00
Misty Stanley-Jones 828b415405 Merge pull request #1639 from docker/mstanleyjones-patch-1
Fix a typo
2017-02-13 13:17:20 -08:00
Misty Stanley-Jones 141c2696c7 Fix a typo 2017-02-13 12:59:16 -08:00
Jeff Anderson d9014406af differentiate trusty and xenial in this step 2017-02-13 13:52:23 -07:00
Josh Wyatt d5f60821fd Correct misspelling 2017-02-13 12:37:17 -08:00
Joffrey F 11f7db62e5 Remove unsupported IPAM config entries in v3
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 12:14:50 -08:00
Ivan Fraixedes e7f6f5ab36 Fix yml file in compose alias example 2017-02-13 16:21:37 +01:00
Shubheksha Jalan eba1bd9372 Update FAQ.md
- Fix error in the section about squashing commits.
- Add a link to the golang wiki for plugins for various editors.
2017-02-13 15:51:00 +05:30
Shubheksha Jalan 5a82021e47 Update step_four.md 2017-02-13 13:11:12 +05:30
Hoat Le 10f0f30ed3 fix typo: redploy => redeploy 2017-02-13 08:44:39 +07:00
cheuberg 9298767020 Fix markdown error
Previous version did not render correctly.
2017-02-12 14:54:20 +02:00
Sebastiaan van Stijn 0ddf0d781a Merge pull request #1613 from Nilz11/patch-1
Update debian.md
2017-02-11 18:21:37 -08:00
Cliff Woolley 5ad417ad37 Fix Markdown; no need to install curl twice 2017-02-11 11:28:45 -08:00
Antti Pihlaja 49bc53ba89 Update digital-ocean.md
Default image was changed to `ubuntu-16-04-x64` here: https://github.com/docker/machine/blame/master/drivers/digitalocean/digitalocean.go#L41
2017-02-11 19:48:29 +02:00
Nilz11 c1e6b41b47 Update debian.md
Fix for command
2017-02-11 15:46:05 +01:00