Commit Graph

44899 Commits

Author SHA1 Message Date
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
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
John Mulhausen a3dd8ff96e Switch to auto-building source of docs-base 2017-02-11 02:55:53 -08:00
Victoria Bialas c8770049b1 Merge pull request #1609 from londoncalling/sample-app-diagram-reskin
updated diagram to match Design provided colours and shapes
2017-02-10 18:00:24 -08:00
Victoria Bialas 1f4fb56733 updated diagram to match Design provided colours and shapes
updated diagram to soften connectors in diagram to lighter grey

modified db boxes on diagram

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 17:49:47 -08:00
Joaquin Casares 483d318528 Update index.md 2017-02-10 19:16:53 -06:00
Victoria Bialas b9f6524a28 Merge pull request #1603 from londoncalling/compose-and-docker-run
compose copyedit
2017-02-10 14:54:31 -08:00
Victoria Bialas 1db710d8f3 compose copyedit
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 14:18:32 -08:00
John Mulhausen 9abc9e9f41 Add documentation for new top command (#1534) (#1601)
Update command lists to include recent additions

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-10 13:59:06 -08:00
Victoria Bialas 03550be339 Merge pull request #1600 from londoncalling/clarify-list-images-feedback
clarified getting started Compose topics based on user feedback
2017-02-10 12:02:31 -08:00
Joao Fernandes 0c480bbce3 Add item to DTR 2.2.1 release notes 2017-02-10 11:51:35 -08:00
Joao Fernandes 71571d0db4 Update cse 1.13 2017-02-10 11:51:22 -08:00
Victoria Bialas 19b5b6ad9e clarified getting started Compose topics based on user feedback
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 11:49:52 -08:00
Misty Stanley-Jones afef955a13 Linux installation improvements (#1560) 2017-02-10 11:31:50 -08:00
Victoria Bialas 81d21e9352 Merge pull request #1587 from londoncalling/d4mac-win-1-13-1
d4mac, d4win stable 1.13.1 release notes
2017-02-10 11:17:53 -08:00
Victoria Bialas 7b5eca08d9 review comments from Misty
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 10:59:53 -08:00
Victoria Bialas d0ad358471 d4mac, d4win stable 1.13.1 release notes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 10:56:18 -08:00
Misty Stanley-Jones 277a98f962 Merge pull request #1592 from datenreisender/patch-1
Small documentation fix
2017-02-10 09:29:03 -08:00
Misty Stanley-Jones 2b14ddd6cb Merge pull request #1595 from pascalandy/patch-1
Fix an issue with CMD docker exec
2017-02-10 09:28:26 -08:00
Misty Stanley-Jones 391adb4c5b Merge pull request #1594 from yallop/dne
Remove a stray 'not'
2017-02-10 09:27:38 -08:00