Commit Graph

44416 Commits

Author SHA1 Message Date
Magnus Lyckå 2f565d6327 Change apt-key keyserver URL
Changed keyserver URL for apt-key to hkp://ha.pool.sks-keyservers.net:80 as it is when you install with the get.docker.com script.
The old URL hkp://p80.pool.sks-keyservers.net:80 caused an error about "gnutls_handshake() failed" on apt update.
2016-11-16 16:17:14 +01:00
Guerin ad491d6d9f Update step_four.md
Added a link to the vi text editor website.
2016-11-16 14:55:58 +01:00
Andreas Kohn f07aa9e026 Use curl's -o to specify the output
This makes it easier to fix up the command by just prepending a `sudo` if something goes wrong.
2016-11-16 13:05:30 +01:00
David Sheets b20a308fee Docked for Mac: Custom host CA certs in stable
Since 1.12.3, custom CA certificates are sourced from the OS X keychain.

/cc @djs55
2016-11-16 11:28:18 +00:00
Jeffery Bradberry b68ad3aced There are two differences
Add missing word.
2016-11-16 04:43:22 -05:00
Xianlu Bird ebb924c362 Update reschedule on node fail
Update reschedule on node fail
2016-11-16 15:40:53 +08:00
Misty Stanley-Jones 089d9100fd Update understanding-docker.md (#406)
* Update understanding-docker.md

* Update understanding-docker.md
2016-11-15 16:06:04 -08:00
Joao Fernandes 2d85b4b3b5 Merge pull request #576 from joaofnfernandes/try-ddc
Add DDC trial
2016-11-15 15:41:07 -08:00
Joao Fernandes 11e4fdc84e Add DDC trial 2016-11-15 15:36:35 -08:00
Misty Stanley-Jones baa71f000b Merge pull request #577 from docker/mstanleyjones-patch-1
Provide clarification on status of `--link`
2016-11-15 13:51:37 -08:00
John Mulhausen 4b05d07fb7 Pre-render nav 2016-11-15 11:49:18 -08:00
Scott A. Lawrence babd3da5e7 Change "tho" to "though" 2016-11-15 14:28:37 -05:00
Misty Stanley-Jones 185b5db95d Provide clarification on status of `--link`
Fixes #353
2016-11-15 10:32:58 -08:00
Joao Fernandes 69b3a3d434 Merge pull request #574 from joaofnfernandes/remove-beta-tags
Remove mentions to beta in ddc
2016-11-15 09:00:50 -08:00
Joao Fernandes e13fa53e95 Remove mentions to beta in ddc 2016-11-15 08:56:26 -08:00
Joao Fernandes 942ca2f21f Merge pull request #555 from gdevillele/PR_fix_keywords_type_for_datacenter
fix type of keywords entry in frontmatter (in /datacenter/)
2016-11-15 08:52:12 -08:00
Kevin Conboy c4d4069279 Update wordpress.md
capital_P_dangit()
2016-11-15 09:47:54 -07:00
Valeri Rangelov 28baff8a81 Fix wrong links in "Testing contributions" Documentation page
- What I did

While reading build documentation I saw two wrong links and proposed fix.

- How I did it

First wrong link: I've change the filter from: is:open is:issue label:kind/test -label:status/claimed -label:status/assigned no:assignee  to: is:issue is:open 
Second wrong link: http://docs.docker.com/project/test-and-docs/ points to "Sorry, we can't find that page", I've change it to:
2016-11-15 17:41:13 +02:00
Daniel Hauenstein a726bf5ab8 rephrase description of adding GUI to USER instruction
Avoiding passive voice in description of adding a GUI to the USER
instruction
2016-11-15 13:18:47 +01:00
Stefan Wüthrich 8c2a09e5e6 Update ubuntulinux.md
Adding Yakkety Deb
2016-11-15 06:43:02 +01:00
Gaetan de Villele 2fc9ecad1b fix type of keywords entry in frontmatter (in /datacenter/)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-14 18:46:44 -08:00
John Mulhausen 6ec5958447 Merge pull request #562 from classmarkets/machine-gce-image-family
machine/gce: explain how to use image families
2016-11-14 17:06:38 -08:00
John Mulhausen 53d8efdfcf Add Segment integration 2016-11-14 16:55:59 -08:00
Joao Fernandes 041e1d8a09 Merge pull request #567 from joaofnfernandes/fix-release-notes-redirect
Add redirect to DTR release notes
2016-11-14 14:58:09 -08:00
Joao Fernandes 6de36b9dce Add redirect to DTR release notes 2016-11-14 14:50:49 -08:00
John Mulhausen d6f2fdea9c Added command for ssh into swarm manager (#560) 2016-11-14 12:24:37 -08:00
Victoria Bialas 2aa39d2fdd Merge pull request #542 from dsheets/patch-3
Docker for Mac: osxfs: remove outdated content
2016-11-14 11:40:01 -08:00
Joao Fernandes b93d045e05 Merge pull request #566 from joaofnfernandes/ddc-upgrade-redirect
Update UCP redirect
2016-11-14 10:51:57 -08:00
Joao Fernandes 191c12bc93 Update UCP redirect 2016-11-14 10:48:03 -08:00
LRubin 64907214b3 Merge pull request #563 from joelemmer/patch-1
Update 9_load-balance_the_service.md
2016-11-14 09:51:36 -08:00
Joe Lemmer 179c14222f Update 9_load-balance_the_service.md
Just fixed a typo. Should have either been 'To load-balance your application' or 'To load-balance an application'.
2016-11-13 20:40:23 +00:00
Peter Schultz 5bde9b0fde machine/gce: explain how to use image families 2016-11-13 18:14:22 +01:00
fresnizky b0e05667f9 Added command for ssh into swarm manager 2016-11-12 19:27:34 -03:00
LRubin 2923850421 Merge pull request #557 from docker/fix-manual-toc
fix manually-generated list-toc links
2016-11-11 16:55:48 -08:00
LRubin f7cd358d8f fix manually-generated list-toc links
for #475
2016-11-11 16:44:28 -08:00
Misty Stanley-Jones b480b75413 Merge pull request #433 from docker/revert-175-patch-1
Revert "Engine reference BUILD tarball contexts mangled"
2016-11-11 16:25:40 -08:00
John Mulhausen 50ca4181d3 Update _config.yml 2016-11-11 15:17:44 -08:00
Gaetan 75fe044313 fix type of keywords entry in frontmatter (in /machine/) (#556)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:51:12 -08:00
Gaetan 01a3ba1e09 fix type of keywords entry in frontmatter (in /cs-engine/) (#554)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:48:10 -08:00
Gaetan 9ca1f95a40 fix type of keywords entry in frontmatter (in /notary/) (#553)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:47:20 -08:00
Gaetan a5e01e1844 fix type of keywords entry in frontmatter (in /engine/) (#552)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:45:24 -08:00
Misty Stanley-Jones b1b1ef532d Merge pull request #544 from cpuguy83/1.12.3-cs4_notes
Add releases notes for 1.12.3-cs4
2016-11-11 14:34:25 -08:00
David Williamson 186dfbb336 Update compose example to work better with swarm
Update the compose example:

* Remove the `links` directive. This allows swarm to distribute containers across available nodes. (with the `links` directive, swarm will be forced to run both containers on the same node.) Note that the `depends_on` directive is sufficient to ensure correct container start up sequence.
* Use a docker volume instead of bind mounting a local directory.
* Give docker-compose commands for shutting down the Wordpress app, showing how to preserve or remove the persisted data in the volume.

Verified proposed change works correctly in both a swarm and a non-swarm environment.
2016-11-11 14:24:39 -08:00
Adrien Duermael d94864d091 remove jekyll-gist from _config.yml (#547)
jekyll-gist gem is not being used anymore.

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-11 13:49:47 -08:00
Joao Fernandes 7c0dc0decd Merge pull request #545 from joaofnfernandes/vnext-datacenter
Add UCP 2.0, DTR 2.1 docs
2016-11-11 12:44:19 -08:00
John Mulhausen 848f35020d Remove draft getting started files (#546)
* Delete index.md

* Delete part2.md

* Delete part3.md

* Delete part4.md

* Delete part5.md
2016-11-11 12:08:02 -08:00
LRubin fb16e8b845 Merge pull request #535 from londoncalling/cloud-dashboard-link
updated link to Docker Cloud and surrounding text
2016-11-11 11:47:43 -08:00
Joao Fernandes 821d1566cd Merge remote-tracking branch 'docs-private/vnext-datacenter' into vnext-datacenter 2016-11-11 11:39:43 -08:00
John Mulhausen 6d7e521235 Fixes #539 2016-11-11 11:34:38 -08:00
Joao Fernandes 3a9a5a73b4 Improve release notes for datacenter 2016-11-11 11:32:12 -08:00