Commit Graph

745 Commits

Author SHA1 Message Date
adamoverton 1a9993c913 fixed typo from adressses to addresses (#2358) 2017-03-16 12:01:43 -07:00
Victoria Bialas 5591401a2d clarified Compose file topic structure, and file examples (#2322)
copyedits, rewrite

fixed some links

simplified/shortened this topic

tweaked description of key, option, value

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-15 10:13:11 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332)
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
Ayushya Chitrannsh d0bb393afe Brief introduction of "swarm" (#2299)
Word Swarm has been used here for the first time, and one line introduction, to what swarm is, would be very beneficial in helping to decide where to begin with.
2017-03-14 18:29:40 -07:00
Myles Keating 75e35c58fb Add Microsoft to list of images (#2304) 2017-03-14 18:27:51 -07:00
Sava Gerov 8481cacd3e Add info about check-config.sh (#2106) 2017-03-14 17:11:34 -07:00
lostwong d4822bf8b2 Update step_six.md (#2309)
Minor fix to indicate that the image id is in the third column
2017-03-14 11:10:51 -07:00
Anthony Vanelverdinghe 86fecbb87f Fix typo "visulizer" (#2297) 2017-03-14 10:02:54 -07:00
Anthony Vanelverdinghe d867751f2d Fix typo "commmands" (#2295) 2017-03-14 02:01:25 -07:00
Victoria Bialas 2ffde079d4 updated command variables for consistency (#2282) 2017-03-13 12:04:32 -07:00
Danny Ruiz 2452effd33 Fix wording in secrets.md (#2272) 2017-03-13 11:54:17 -07:00
Brian Goff dd0207cf47 Remove logdriver details for NATS (#2240)
The NATS driver was never integrated into Docker and should not be in
the docs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-10 12:37:23 -08:00
Roman Hotsiy c6c3476c6c Upgrade to ReDoc 1.11.0, closes #2246 (#2249) 2017-03-10 11:53:37 -08:00
Victoria Bialas 5756339274 updated links to Docker for Mac and Windows install (#2248) 2017-03-09 23:40:03 -08:00
John Mulhausen 1127efaa78 Update ubuntu.md 2017-03-09 17:36:37 -08:00
Alan Thompson 5ce24b0587 Update work-with-networks.md (#2236)
Clarify what is being connected to the network.
2017-03-09 17:10:04 -08:00
Victoria Bialas 7ea080d16e Merge pull request #2244 from londoncalling/single-node-swarm
added instructions on removing an app
2017-03-09 16:53:39 -08:00
Alan Thompson dfd33195bd Update work-with-networks.md (#2235)
Fix typo 3 -> 4.  Add clarification that we are using container4 to ping container4.
2017-03-09 16:46:28 -08:00
Victoria Bialas f9c2eef3ba added instructions on removing an app
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-09 16:41:20 -08:00
Misty Stanley-Jones c9ac1eedeb Merge pull request #2215 from cloojure/patch-2
Update work-with-networks.md
2017-03-09 15:50:35 -08:00
Misty Stanley-Jones 7a61d77d70 Merge pull request #2214 from cloojure/patch-1
Update work-with-networks.md
2017-03-09 15:49:06 -08:00
Misty Stanley-Jones 566110ba4e Merge pull request #2112 from delfuego/patch-1
Remove incorrect iptables-related information
2017-03-09 15:33:32 -08:00
Victoria Bialas bf36662513 changed rm images example to rmi
updated to include both commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 20:31:24 -08:00
Alan Thompson 317a695a03 Update work-with-networks.md
grammer error
2017-03-08 19:09:27 -08:00
Alan Thompson 1dbafefda6 Update work-with-networks.md
small typo
2017-03-08 18:57:25 -08:00
Victoria Bialas 26f0144dc6 tip re: Windows encoding errors on file downloads
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 17:53:09 -08:00
Victoria Bialas 051fcffccb copy-edit, more explanation on command line savvy 2017-03-08 16:54:06 -08:00
Roman Vynar 504fdf9295 Fix the command for generating content trust delegation cert. (#2163) 2017-03-08 14:29:36 -08:00
Victoria Bialas a08459dd67 updates to voting app intro, moved services descriptions under config file topic
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 13:23:40 -08:00
Misty Stanley-Jones d8e65c68b5 Fix repo paths in SLES instructions 2017-03-08 10:20:00 -08:00
Victoria Bialas 4e0c5c2ccc Explained deploy key for services not in example 2017-03-07 19:18:26 -08:00
Victoria Bialas 2b3bdf94d7 simplify, clarify, and improve intro to voting app
clarified details on which method we'll use to log into nodes

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-07 18:21:14 -08:00
Misty Stanley-Jones a1ed9bd5db Merge pull request #2074 from Djelibeybi/patch-1
Update upstream package names
2017-03-07 15:36:31 -08:00
Ivan Ivanov 69f4cb34ab Update consistency of <manager-IP>:<port> (#2117)
This is the same issue as the page "Try it out and vote". I have updated the consistency of format to be the same through all pages. (and I hope I do not overdo these small things, but I just like the ease of proposing changes to the documentation and I hope that it is getting better this way)
2017-03-06 12:01:45 -08:00
Ivan Ivanov 5ee2ad9a8c Update consistency of <manager-IP>:<port> (#2111)
On the "Sample app overview" page all blocks of IP address and port are shown as <manager-IP>:5000 or <manager-IP>:5001.
On this page "Try it out and vote" I see some inconsistency of these forms and fixed them, because I think the style format must be in the form "<manager-IP>:5000", e.g., colon after character ">".
2017-03-05 07:49:25 -08:00
Jason Levine ee05ddfb21 Remove incorrect iptables-related information
At the current time, Docker flushes any pre-existing DOCKER and DOCKER-ISOLATION chains, meaning that the previous advice was misleading and led users in the wrong direction regarding restricting access to containers via iptables.
2017-03-04 19:17:01 -05:00
Ivan Ivanov 3b57a7ca71 FIX Duplicate "are" (#2110)
"on Mac and Windows are are as follows"
Removed the duplicated "are".
2017-03-04 15:06:23 -08:00
Victoria Bialas 2910fd413e clean up code and images
simplified stack file sample and instructions

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-03 16:51:22 -08:00
John Mulhausen 81de59357a Update overview.md 2017-03-03 13:31:23 -08:00
Ivan Ivanov 4e09a4ab2b 2 small changes (#2091)
"(indicated by the stretch suffix on the version, in this example)"
The example uses jessie, not stretch.

"change the word stable in the > URL to edge"
I do not know why this character ">" appeared, maybe it is a mistake and I have removed it?
2017-03-03 12:15:05 -08:00
travisjs 0647b485c5 Update step_six.md (#2095)
* Update step_six.md

I need to add the -f option to remove image, otherwise: Error response from daemon: conflict: unable to delete e867bc17a0bb (must be forced) - image is referenced in multiple repositories

* Fix for image remove command
2017-03-03 12:12:46 -08:00
Ivan Ivanov 02f2717eed 3 typo changes (#2093)
```bash
    sudo nano /etc/docker/daemon.json
    ```
Here a $ sign is missing and the command in the web site appears as "bash sudo nano /etc/docker/daemon.json", which is not correct. It shoud look like: "$ sudo nano /etc/docker/daemon.json".

"which is 2375 if you do not use TLS, and 2376 if you do."
On all other lines the ports are in backquotes, so I have added backquotes here also.

"In this case, steps 3 and 4."
Missing verb like "repeat", I have added it.
2017-03-03 12:09:25 -08:00
Misty Stanley-Jones 8d9e90a6cd Lots of formatting fixes to do with buttons 2017-03-02 15:51:17 -08:00
Avi Miller 6ee54bab0f Update upstream package names
Oracle Linux never shipped the upstream (RHEL) Docker packages but did ship `docker-engine-selinux` which would need to be removed.

Though, given the new Docker EE/CE naming convention, yum would just replace any existing `docker-engine` and `docker-engine-selinux` packages anyway.
2017-03-03 09:51:46 +11:00
John Mulhausen e571acab56 Merge pull request #2066 from canzanos/patch-1
Update step_four.md
2017-03-02 12:56:37 -08:00
Misty Stanley-Jones ef93f3ecd2 Merge pull request #2068 from mstanleyjones/fix_matrix
Fix platform matrix table
2017-03-02 12:53:19 -08:00
Misty Stanley-Jones aef34f101c Fix platform matrix table 2017-03-02 12:22:31 -08:00
Paul V. Novarese 668629441f s/Ubuntu/CentOS/ (#2057) 2017-03-02 11:54:56 -08:00
John Mulhausen 7f5915dcdd Merge pull request #2047 from ansmirnov/patch-1
Fixed error in link
2017-03-02 11:07:05 -08:00
Stephen Canzano 74395f9c69 Update step_four.md 2017-03-02 13:31:58 -05:00