Commit Graph

739 Commits

Author SHA1 Message Date
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
David Xia 142e4a95bb
Fix typo in networking docs
should be "nameserver" instead of "server."
2017-03-02 13:23:27 -05:00
Misty Stanley-Jones cc4d70cf78 Fix yum variables again 2017-03-02 08:36:46 -08:00
Misty Stanley-Jones 8f3267b9b0 Correction to Yum variable 2017-03-02 06:53:44 -08:00
Misty Stanley-Jones 3108d86b6d Docker 17.03 release (#2050)
* First pass of tabs-based organization

* Improvements

* Second pass at tabs org

* Move tab highlighting to Liquid instead of JS

* Adding forwarding links for in-product TOCs

* Move to pre-rendered left-navs instead of post-load JS for TOC sync

* Optimizations and nosync-ing the Reference section

* Optimizations, fix Cloud YAML

* Make a "Sample applications" node

* Update index.md

* Tabs CSS fixes and 12-factor reposition

* Theme Start (#1709)

* Hooking up nav to real TOC data, formatting fixes

* Fixing JS error

* Layout updates, dark themes, tons o stuff (#1971)

* Add cookie saving for day/night mode

* Newsite tabs (#2004)

* Layout updates, dark themes, tons o stuff

* Update themes

Theme updates + scaffolding

* Update style.css

* Update style-alt.css

* Missing font fixes

* Import Open Sans from Google

* Font fix, archive removal in TOC, favicon, Feedback img fix

* Oops, returning -webkit-font-smoothing: antialiased;

* Add old favicon.ico

* Make archives a non-tiered link

* Reorder docs archive to newest-first, add local instructions

* Commenting out day/night switch for now

* Fix 'rate this page'

* Rate this page fixes

* Autocomplete and Docker Cloud fixes

* Open tree to current page

* Adding indentation for nav collapse in

* Ensure left nav visibly displays the current topic

* Update flex layout

- adjust rescale
- code block styles

* add focus to search

- force code block color (for now)
- increase section max-width

* increase content padding

- add padding to toc for wrapping long strings.

* grid adjustment

- grid
- content and wrapper adjustments for mobile

* left/right sidebar adjustments

- refine position on scroll for toc on landing

- add default height to compensate for upcoming position absolute
onScroll

* side bar overflow

- hidden on X-scroll

* fix version button

- override bstrap defaults

* tabs + buttons

* update landing svgs

* fix sidebar height

set to 100% on landing pre-affix

* Update blurb about engine/editions on front page

* add side menu to mobile collapse menu

* update classnames

* overall mobile tweaks

* Right-nav highlighting and auto-scroll

* Slightly slower right-nav highlighting, correct version

* add toggle menus for small devices

* Fixing JS error/Docker 1.13>17.03

* header updates

* re-add fan to header

* update transition time

* Add first 20 words to Twitter card

* fixed width of components

- lockdown elements on rescale (wil need more TLC)

* set max-width of content

* Left and right nav resizing w/footer scroll and window resize

* update links on landing page

* Fix for overzealous resizing, JS redundancies

* Fix for JS error on homepage

* JS error fixes

* toggle adjustments

- wrap toggle button

* add tab width

* version button type

* version button both headers

* tabs - fix typo

* landing page grid

* components

* Share images, JS fixes, Marketo removal

* Anchor links fix

* Fix for black space on mobile

* Restore hamburger (partial)

* Update run.md

Minor grammar cleanup.

* 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.

* Update apparmor.md

Fixed the indentation for the codeblock (indented by 4 spaces). Thank you for your careful review.

* Replacing service with secret

* Update networking.md

fix typo with triple "m" for command word

* Update run.md

Address PR feedback.

* Update install instructions to latest version

* Added "related topics" section

* Add documentation for mem_swappiness

* Update to new Docker version scheme (#1926)

* mem_swappiness for current version and v1

* merge other changes, fix typo

* There is no OpenSuSE and there never was

though we had SuSE and S.u.S.E.

* Add release notes for 1.12.6-cs9 (#2028)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

* need sudo to access key cache (#1931)

* need sudo to access key cache

* List other keyservers to try for cs-engine install (#2033)

* List other keyservers to try for cs-engine install

Sometimes ha.pool.sks-keyservers.net goes down, so let's provide some
other keyservers to try in such cases.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

* Update work_issue.md (#2030)

Change "re-start" to "restart". Though not included in "Prefered usages" in the documentation guide, but I think "restart" is better and used more frequently. Besides, some other docs here, such as "Keep containers alive during daemon downtime" of "Admin Guide", also use "restart".

* Update create_pr.md (#2015)

* Update work_issue.md (#2013)

Change "id" to "ID" except for those in code.

* Update set_up_dev.md (#2011)

Add periods (.) in some steps.

* Update set_up_dev.md (#2010)

Apply Oxford Comma as described in the documentation guide.

* Update create_pr.md (#2014)

Delete an extra space.

* Update trust_key_mng.md (#1883)

* Update trust_key_mng.md

* Update trust_key_mng.md

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.

* Update 

I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown. 

Now I've deleted some redundant whitespace.

* Update content_trust.md (#1912)

* Update content_trust.md

* update deprecation policy

Signed-off-by: Victor Vieux <victorvieux@gmail.com>

* Update info about how to check whether Docker is running

* Updated docs to reflect edge channel

Signed-off-by: French Ben <frenchben@docker.com>

* Updated wording for SP creation

Signed-off-by: French Ben <frenchben@docker.com>

* beta to edge, cloud features first draft

added cloud images

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Distinguish between cloud stack file and stack file

* Added EE links

Signed-off-by: French Ben <frenchben@docker.com>

* Use variables

Signed-off-by: French Ben <frenchben@docker.com>

* Replace deprecated MAINTAINER with LABEL (#1445)

Replace MAINTAINER instruction with LABEL as MAINTAINER was deprecated in https://github.com/docker/docker/pull/25466

* Updates for Docker CE and Docker EE

* Updated DDC launch button

Signed-off-by: French Ben <frenchben@docker.com>

* added Docker Cloud topics for Mac and Windows

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* d4mac, d4win stable and beta release notes for 17.03.0

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-02 05:54:49 -08:00
Andrey S 476cfa4449 Fixed error in link 2017-03-02 12:35:14 +04:00
Victoria Bialas 61e9f0c82f Merge pull request #2042 from londoncalling/clarify-docker-stack-deploy-voting-app
clarified docker stack deploy and bundles
2017-03-01 22:16:01 -08:00