Commit Graph

771 Commits

Author SHA1 Message Date
mike 9fa709ecae Fix sentence. (#1976) 2017-02-27 13:05:13 -08:00
Wang Jie 1e03ea30b2 Update trust_sandbox.md (#2000)
Should it be "Now, you xxx" or "Now that you xxx"?
2017-02-27 12:59:15 -08:00
Michael Kalish 5d83182b65 Replacing service with secret 2017-02-26 18:04:55 -05:00
Victoria Bialas b50a948cd1 removed Tip on setting env variables, not needed 2017-02-26 02:51:45 -08:00
Victoria Bialas c3d60c11e3 feedback on PowerShell env setup, clarified env vs. ssh
copyedits for Mac and Windows distinctions

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-26 02:18:38 -08:00
scjane 41d57e3ba0 Update trust_sandbox.md (#1966)
Added a colon (:). But I'm not sure whether a period (.) is more appropriate here.
2017-02-24 13:53:39 -08:00
scjane a1f580fb11 Update admin_guide.md (#1967) 2017-02-24 13:51:18 -08:00
scjane ad5ddc3f76 Update admin_guide.md (#1968)
* Update admin_guide.md

Fixed an invalid link.

* Update admin_guide.md
2017-02-24 13:50:20 -08:00
Victoria Bialas e6ef517148 fixed link to .yml example file
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 23:56:01 -08:00
Victoria Bialas d314a49671 copy-edit to remove extra backtick in command 2017-02-23 18:48:07 -08:00
Victoria Bialas e7791c4c76 updated note re: virtualbox download
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 18:21:45 -08:00
Victoria Bialas 5f152ba7d9 Merge pull request #1952 from londoncalling/swarm-tutorial-onpage-links
swarm mode tutorial improvements
2017-02-23 18:10:01 -08:00
Victoria Bialas 7aaf72119d updated swarm and voting app tutorials per d4mac, d4win, toolbox and driver issues
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 17:48:22 -08:00
Misty Stanley-Jones 2c1309d80d Merge pull request #1944 from hobti01/patch-1
Add troubleshooting tip for default https port
2017-02-23 17:03:17 -08:00
Misty Stanley-Jones eb43f86a67 Merge pull request #1941 from scjane/patch-50
Update nodes.md
2017-02-23 17:02:17 -08:00
scjane 52451c4bad Update manage-nodes.md (#1939)
* Update manage-nodes.md
2017-02-23 17:01:41 -08:00
Misty Stanley-Jones a0e23cc131 Merge pull request #1938 from scjane/patch-48
Update manage-nodes.md
2017-02-23 16:57:09 -08:00
scjane 1ad3112d03 Update rolling-update.md (#1935)
* Update rolling-update.md
2017-02-23 16:56:13 -08:00
Brian Kaufman b6953e5b22 Step 14 incomplete (#1916)
* Step 14 incomplete

Mention of a daemon file but its exact location is absent , I've added this in
2017-02-23 16:36:23 -08:00
Brian Kaufman 966fcfc6db Step 2 is incomplete (#1915)
* Step 2 is incomplete

Step 2 asks you to install the LVM2 package however instructions on how to do this are missing. I've added that in for completeness.
2017-02-23 16:31:29 -08:00
Victoria Bialas d4add4ee20 swarm mode tutorial improvements
modified what's next link to map to left nav TOC

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 15:21:31 -08:00
scjane 16f87ee78f Update etwlogs.md (#1942) 2017-02-23 14:25:22 -08:00
scjane 71ccca95b9 Update join-nodes.md (#1937) 2017-02-23 14:24:52 -08:00
Victoria Bialas be40ae6369 Merge pull request #1950 from londoncalling/voting-app-tweaks
tweaked note re: d4win on sample workflow
2017-02-23 12:55:34 -08:00
Victoria Bialas 3181700000 Re-wording, simplify 2017-02-23 12:54:30 -08:00
Victoria Bialas 735a09c391 tweaked note re: d4win on sample workflow
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 12:39:15 -08:00
Tim H d636c8781d Add troubleshooting tip for default https port
Rename the CA certificate file to ca.crt: It is not the cert of the server, but of the CA.
2017-02-23 13:42:51 +01:00
scjane 18a0f31566 Update nodes.md 2017-02-23 18:30:52 +08:00
scjane a82ee88aa8 Update manage-nodes.md 2017-02-23 17:50:35 +08:00
scjane a90f70e360 Update join-nodes.md (#1936) 2017-02-23 01:27:46 -08:00
scjane e970a64a97 Update create-swarm.md (#1934) 2017-02-23 01:18:15 -08:00
scjane cb79fe5a1a Update create-swarm.md (#1933) 2017-02-23 01:17:02 -08:00
Victoria Bialas b1c3c6d838 more copyedits 2017-02-22 23:57:39 -08:00
Victoria Bialas 10f8f760f7 more copy-edits 2017-02-22 23:56:25 -08:00
Victoria Bialas 21f8c37283 copy-edit 2017-02-22 23:55:11 -08:00
scjane 39eb8edf8a Update apparmor.md
Fixed the indentation for the codeblock (indented by 4 spaces). Thank you for your careful review.
2017-02-23 14:03:06 +08:00
Victoria Bialas 1d21dea18e voting app graceful shutdown, d4win compatibility
fixed tips and links

copy-edits and re-wording finishing touches

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-22 21:27:33 -08:00
Misty Stanley-Jones 22e52d7b1b Merge pull request #1924 from docker/1911_fix_grammar
Fix grammar
2017-02-22 13:50:05 -08:00
Misty Stanley-Jones f1c74e8793 Fix a typo
Just missing a word.
2017-02-22 13:42:48 -08:00
Misty Stanley-Jones de2d6f8191 Fix grammar
Fixes #1911
2017-02-22 13:37:22 -08:00
Avi Miller 828e6212ce Updating the Oracle Linux installation documentation (#1922)
* Updated Oracle Linux instructions

* Change the note about the UEK4, because it's not only required for `btrfs` support
* Added a note about the fact that Oracle also ships a supported package with the same name as upstream
* Added a note about the fact that we've already deprecated docker-engine-selinux
* Added a link to the Oracle Linux Docker User's Guide
* Fixed the GPG key section as it will not be shown during the `makecache fast` run but rather will automatically be accepted when the yum install command is run. 
* Added a note about disabling the `-y` parameter to prevent the automatic acceptance of the upstream GPG key
* Provided the specific GPG key output for better validation
* Provide context about the fact that `docker-engine` exists in the Oracle Linux addons repo as well and may appear in the results of the `yum ilst` command.
* Provide more context for the `btrfs` subvolume removal

* overlay2 is only supported on UEK4

The default RHCK (3.10) does not support overlay2.

Signed-off-by: Avi Miller <avi.miller@gmail.com>
2017-02-22 13:30:50 -08:00
mw75 dddd864438 Update services.md (#1504)
* Update services.md
2017-02-22 11:15:15 -08:00
scjane 751ef1ac3c Update baseimages.md (#1671)
* Update baseimages.md
2017-02-22 10:56:37 -08:00
scjane dbe18ae730 Update dockerfile_best-practices.md (#1672)
* Update dockerfile_best-practices.md
2017-02-22 10:55:28 -08:00
Misty Stanley-Jones 7b24cef2c1 Merge pull request #1880 from scjane/patch-40
Update seccomp.md
2017-02-22 10:08:41 -08:00
scjane e55d2893bf Update trust_delegation.md (#1866)
* Update trust_delegation.md

Fix subject-pronoun disaggrement.
2017-02-22 09:51:49 -08:00
scjane 80483cd487 Update seccomp.md (#1879) 2017-02-21 18:50:42 -08:00
Victoria Bialas 74ddfa90eb adding new images for change in voting app .yml
finishing touches on documenting updated .yml

modifed more images and text per new .yml config

more updates to images

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-21 18:01:50 -08:00
Victoria Bialas 20eef507d7 simplify home page of voting app example
removed link to legacy topic in voting app example

removed link to legacy topic on docs home page

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-21 14:52:41 -08:00
scjane 76754d2502 Update trust_sandbox.md 2017-02-21 11:41:50 -08:00
scjane ff4a20f18e Update trust_key_mng.md 2017-02-21 11:34:19 -08:00
scjane b1cd25ff94 Update trust_key_mng.md 2017-02-21 11:33:38 -08:00
Misty Stanley-Jones 980f3cc83a Remove duplicated content from CLI ref stub files 2017-02-21 09:35:45 -08:00
scjane 1dc6441a6a Update seccomp.md 2017-02-21 16:15:53 +08:00
scjane 3f293f1060 Update apparmor.md
I'm a little confused about which one is better to be used here, a period (.) or a colon (:),  as a command is given below. Or both are OK, and we only have to keep consistency in a single page.
2017-02-21 15:24:40 +08:00
scjane d709c6c68c Update trust_sandbox.md (#1872) 2017-02-20 03:08:10 -08:00
scjane 33fdf82c32 Update trust_sandbox.md (#1871) 2017-02-20 03:07:44 -08:00
scjane 866aeebd88 Update trust_delegation.md (#1864) 2017-02-20 03:05:51 -08:00
scjane 6b2f5cc8eb Update content_trust.md (#1861) 2017-02-20 03:05:23 -08:00
scjane d98ad39ee9 Update content_trust.md (#1860) 2017-02-20 03:04:44 -08:00
scjane 14ee5d6515 Update certificates.md (#1859) 2017-02-20 03:04:03 -08:00
scjane 69aedaf28a Update security.md (#1858) 2017-02-20 03:03:26 -08:00
scjane a7773cd9e9 Update trust_delegation.md (#1863) 2017-02-20 03:02:46 -08:00
scjane 4a950fb6f3 Update trust_delegation.md (#1865)
Quotation marks deleted to keep the style for links consistent on this page and conform to the conventions about "Link" described in "Style guide for Docker documentation" . (Another link on this page is "For more detailed information about how to use Notary outside of the default Docker Content Trust use cases, please refer to the Notary CLI documentation.")
2017-02-20 02:59:56 -08:00
scjane 59535b9524 Update deploying_notary.md (#1867)
Add an ending period for step 1 as it is a complete setence and step 2 and step 3 both end with a period.
2017-02-20 02:50:41 -08:00
scjane 6a3651b393 Update trust_delegation.md (#1868) 2017-02-20 02:50:11 -08:00
scjane 173e9611d8 Update trust_key_mng.md (#1869) 2017-02-20 02:49:43 -08:00
scjane ae2d431d3d Update trust_key_mng.md (#1870) 2017-02-20 02:49:20 -08:00
Rafael Eyng 161c3e47b6 fix in logging/overview.md (#1852)
Changes `<NAME>-<VALUE>` to `<NAME>=<VALUE>`
2017-02-18 12:49:02 -08:00
scjane 17b6bf3c40 Update etwlogs.md (#1811) 2017-02-17 18:23:13 -08:00
scjane 1c278c89f1 Update resource_constraints.md (#1804) 2017-02-17 18:21:05 -08:00
scjane 8f2cc20f6a Update view_container_logs.md (#1806) 2017-02-17 18:19:29 -08:00
scjane 41e15067ca Update work-with-networks.md (#1810) 2017-02-17 18:19:04 -08:00
scjane 5c8a98accc Update overview.md 2017-02-17 16:10:32 -08:00
scjane 89708c427b Update faq.md 2017-02-17 11:59:36 -08:00
scjane 01278d0c4e Update index.md
Seems that "and" is missing?
2017-02-17 11:59:13 -08:00
Pascal Andy f8cd1174db Fix docker ps ... --name (#1795)
Should be docker ps ... name
2017-02-16 23:43:13 -08:00
scjane 754e4ece0a Update device-mapper-driver.md (#1760) 2017-02-16 11:56:11 -08:00
scjane a7b79e9cf3 Update device-mapper-driver.md (#1761) 2017-02-16 11:55:47 -08:00
Alessandro Boch 46a9be7289 Clarify port to open for overlay networking (#1762)
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-16 11:52:55 -08:00
scjane da06fe0c75 Update aufs-driver.md (#1712) 2017-02-16 01:15:58 -08:00
scjane 6206bf72a6 Update device-mapper-driver.md (#1713) 2017-02-16 01:15:29 -08:00
scjane 56fe032401 Update device-mapper-driver.md (#1714) 2017-02-16 01:15:08 -08:00
scjane 038ad219bf Update device-mapper-driver.md (#1715) 2017-02-16 01:14:43 -08:00
scjane d04208ffbb Update device-mapper-driver.md (#1716) 2017-02-16 01:14:14 -08:00
scjane 81464dbaae Update btrfs-driver.md (#1717) 2017-02-16 01:13:32 -08:00
scjane d614fe5f8f Update overlayfs-driver.md (#1719) 2017-02-16 01:12:59 -08:00
scjane c0d112b4db Update overlayfs-driver.md (#1721) 2017-02-16 01:12:33 -08:00
scjane 368670c1ef Update zfs-driver.md (#1727) 2017-02-16 01:11:53 -08:00
scjane 8b40f11554 Update zfs-driver.md (#1729) 2017-02-16 01:11:27 -08:00
scjane 2b7f04a311 Update zfs-driver.md (#1731) 2017-02-16 01:10:41 -08:00
scjane 18a5047bfa Update index.md (#1739) 2017-02-16 01:10:04 -08:00
scjane 4284e25bb2 Update index.md (#1735) 2017-02-16 01:09:41 -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 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
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
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 141c2696c7 Fix a typo 2017-02-13 12:59:16 -08:00
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
Cliff Woolley 5ad417ad37 Fix Markdown; no need to install curl twice 2017-02-11 11:28:45 -08:00
Nilz11 c1e6b41b47 Update debian.md
Fix for command
2017-02-11 15:46:05 +01: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
Misty Stanley-Jones afef955a13 Linux installation improvements (#1560) 2017-02-10 11:31:50 -08:00
Pascal Andy adf14bbba3 Fix and issue with CMD docker exec
docker exec $(docker ps --filter name=redis -q)

not docker exec $(docker ps --filter --name=redis -q)

Cheers!
2017-02-10 11:13:12 -05:00
John Mulhausen d416168b31 Update index.md 2017-02-09 23:50:15 -08:00
Justyn Shull c59f972f46 Update secrets.md - fix typo (#1574)
rottate -> rotate
2017-02-09 12:19:37 -08:00
Misty Stanley-Jones 63ca90797d Merge pull request #1543 from ArcticSnowman/master
Update example for --syslog-address for unix path
2017-02-08 19:05:34 -08:00
Misty Stanley-Jones 45aa25c0c6 Merge pull request #1547 from jefferybradberry/patch-2
Update services.md
2017-02-08 19:04:49 -08:00
Avi Miller 644ee5f294 Remove Oracle Linux issues
Neither of the documented issues are still an issue on current versions of Docker on Oracle Linux.
2017-02-09 13:44:02 +11:00
Sravan S 8b8c8e2d0c Update repository setup step for Linux Mint users (#1537)
* Update repository setup step for Linux Mint users

Add a note to remind people using distributions derived from Ubuntu(Linux Mint)
to change the ubuntu-$(lsb_release -cs) part to their parent Ubuntu release. 

The output of $(lsb_release -cs) won't necessarily be a stable Ubuntu release, it would
sometimes be something like 'rafaelia' and there could be problems in the installation
2017-02-08 17:01:27 -08:00
Abhishek Kandoi f6e3e14e84 Fix typo (#1557)
Change intall to install
2017-02-08 13:26:41 -08:00
Victor Vieux 80fa030ffd bump engine API to 1.26 (#1553)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-08 13:18:24 -08:00
Jeffery Bradberry a9da7672a5 Update services.md 2017-02-07 14:14:05 -05:00
Steven Arnott 7823e98796 Update example for --syslog-address for unix path
Update example for --syslog-address for unix path to include 'unix:' protocol that is needed.
2017-02-07 12:54:14 -05:00
Ryan Sanford d91cab01bc Fix base image creation example commands (#1409)
Example commands for creating a base image do not work due to multiple issues.
- 16:04 not a valid tag for ubuntu image
- apt-get install fails without preceeding `apt-get update`
- gcc command fails without `-nostartfiles` flag
- `docker run` without the `--rm` leaves behind containers which is unintuitive, and inconsistent with the build image used above.
2017-02-07 09:52:31 -08:00
Misty Stanley-Jones 9420f4cc89 Merge pull request #1429 from Mic92/patch-1
zfs: fixed assumptions about thin provisioning
2017-02-07 09:50:07 -08:00
Sivakumar Raja a0009fbada Corrected a typo and error in docker start command (#1508)
* Corrected a typo in Fedora install instructions

* Removed the change on docker start command.

Changed the command from `sudo systemctl start docker` to `sudo systemctl docker start` as it was addressed on other PR, so leaving it to the original one.
2017-02-07 09:38:22 -08:00
Misty Stanley-Jones ef2c5002ca Merge pull request #1375 from vikstrous/patch-1
remove reference to overlay2 as a filesystem
2017-02-06 17:13:05 -08:00
Misty Stanley-Jones 6ed0295440 Merge pull request #1382 from dmonroy/patch-1
update sample output regarding package version information
2017-02-06 17:12:11 -08:00
Misty Stanley-Jones b8525d459d Merge pull request #1386 from alexlist/patch-1
software-properties-common is required for add-apt-repository
2017-02-06 17:11:15 -08:00
tradfor 4d01901e7c Added a new remove unofficial docker step (#1468)
* Added a new remove unofficial docker step
2017-02-06 17:01:44 -08:00
huangsen365 76461f517e Update centos.md (#1523)
* Update CentOS, RHEL, Fedora instructions for starting Docker
2017-02-06 16:55:29 -08:00
Joao Fernandes 8eddd3f80f Merge pull request #1526 from aboch/esp
Fix docs about what protocol must be allowed for network encryption
2017-02-06 14:24:16 -08:00
Alessandro Boch 649210111a Fix docs about what protocol must be allowed for network encryption
- This was inadvertently changed to `port`

Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-06 10:04:31 -08:00
Adam Eijdenberg 9d2b5f32bb Add documentation around pipefail to address issue 1459 (#1460)
* Add documentation around pipefail to address issue 1459

Signed-off-by: Adam Eijdenberg <adam.eijdenberg@gmail.com>
2017-02-06 09:52:19 -08:00
Victoria Bialas 11363d7582 Merge pull request #1475 from docker/londoncalling-patch-3-1
add a link to the voting app sample
2017-02-03 16:49:27 -08:00
Victoria Bialas 49d3957e47 Update last_page.md 2017-02-03 14:30:37 -08:00
Misty Stanley-Jones 811aa5d54a Merge pull request #1437 from onelovelyname/patch-1
Add instructions for manual start of Docker daemon
2017-02-03 13:49:22 -08:00
Melanie Gin 752d79f3ee Add instructions for manual start of Docker daemon 2017-02-03 13:37:25 -08:00
Misty Stanley-Jones f46129b40c Merge pull request #1449 from Rick-Anderson/patch-3
Update faq.md
2017-02-03 11:13:22 -08:00
Daniel Suo 9e5e14f0e6 Add link to C SDK 2017-02-03 11:17:46 -05:00
Misty Stanley-Jones ad900b3f07 Merge pull request #1470 from JamesDrummond/patch-1
Update ubuntu.md
2017-02-02 13:30:21 -08:00
Misty Stanley-Jones 8d3145ff3b Add an automatic TOC to pages that don't have no_toc in front-matter 2017-02-01 19:49:07 -08:00
Victoria Bialas 6171ffce72 add a link to the voting app sample
* Added a link to the voting app sample from the Getting Started tutorial "learn more" list of topics
2017-02-01 16:24:28 -08:00
Victoria Bialas 27106d338c linked to "service" definition in glossary, edits
* added a link to the glossary definition for "service"
* improved wording on description of what a service is, inline here
2017-02-01 15:14:21 -08:00
Victoria Bialas d404e6f134 Update customize-app.md 2017-02-01 14:21:54 -08:00
Victoria Bialas 3a877398f1 Merge pull request #1469 from londoncalling/more-voting-app-tweaks
improved voting app intro
2017-02-01 14:12:19 -08:00
James Drummond bd3cda58b4 Update ubuntu.md
Added line `apt-get install software-properties-common` to install packages that include `add-apt-repository`.
2017-02-01 15:39:01 -06:00