Commit Graph

35 Commits

Author SHA1 Message Date
T.D. Gonzales 98e825dd39
Adding wordpress environment variable.
Wordpress needs to know what db to it's user has access to. Without this mysql throws access denied errors.
2019-01-28 21:12:09 -07:00
paigehargrave 0dab4ade68
Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
paigehargrave 695bc2a1b2
Update wordpress.md 2019-01-11 14:50:25 -05:00
Maria Bermudez 1a5c6b7287
Merge pull request #7679 from waclawjacek/patch-1
Mark "docker-compose down" as code, not a link
2019-01-02 10:39:33 -08:00
Waclaw Jacek 8c453b4a96
Make command reference links inline. Props @thaJeztah 2018-11-14 12:49:36 +01:00
Waclaw Jacek bea899abb0
Mark "docker-compose down" as code, not a link
To make it clear `docker-compose down` is a command, mark it as code and include a link to documentation below.
2018-11-14 10:48:08 +01:00
Vitor Reis 1596b778fe
NOREF - Fix Invalid docker-compose.yml sample
Without specifying this the user gets:
docker-compose up -d
ERROR: Top level object in './docker-compose.yml' needs to be an object not '<class 'NoneType'>'.
2018-09-25 21:30:57 +02:00
Ryoichi Obara 3bb62ef910 Update wordpress.md
- Fix/Change volume name ``dbdata`` to ``db_data`` (Fit with ``db_data`` in Notes section.)
2018-04-18 16:05:25 -07:00
Robert Kielty 56ec08b1a6 Two minor grammar fixes, one clarification (#6406) 2018-04-09 19:10:33 -07:00
Dave James Miller 3035ad0971 Fix capitalisation of WordPress in 3 places 2018-03-12 14:19:41 -07:00
Patrick Chanezon 1e88fbd088 update wordpress compose file (#6029) 2018-02-16 14:49:42 -08:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Achilleas Pipinellis 59ca09a210 Make the link in wordpress.md point to the right engine doc (#4838)
Although there's a redirect, it's better to link to to the
right place.
2017-10-09 17:02:23 -07:00
Victoria Bialas 6660c8ef69 put back missing Compose Wordpress example (#4228)
* put back missing Compose Wordpress example

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

* addressed review comments, postponing one comment re: yaml code fencing

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-16 17:07:28 -07:00
Misty Stanley-Jones 0c7d3b5f4c Deprecate some Dockerize topics in favor of library ones (#3735) 2017-07-12 12:06:07 -07:00
Victoria Bialas ffc99ea6e1 updated/improved Compose samples (#3438)
* updated/improved Compose samples

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

* linked some more basic docker-compose commands

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

* coypedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-30 17:15:42 -07:00
Victoria Bialas 9a74081df7 add note re: ports for multi-site Wordpress (#3398)
* add note re: ports for multi-site Wordpress

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

* incorporated review comments from Misty

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

* copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-30 13:20:33 -07:00
Bhavin Gandhi 386d6dc6f7 Fix missing database user for Wordpress service (#2824)
* Fix missing database user for Wordpress service

It defaults to root if not specified. https://hub.docker.com/_/wordpress/

* Change root password to avoid confusion.
2017-04-18 13:03:08 -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
Victoria Bialas a259f45166 clarified use of .yml and .yaml for Compose file, both can be used
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-18 12:21:51 -08:00
John Mulhausen 0b71b84ad4 Merge pull request #550 from davidwilliamson/patch-1
Update compose example to work better with swarm
2016-11-17 17:30:14 -08:00
Kevin Conboy c4d4069279 Update wordpress.md
capital_P_dangit()
2016-11-15 09:47:54 -07: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
Jonas Friedmann 4d83c1bb08 Add missing dollar-sign / consistent shell style (#426)
* Add missing dollar-sign

* Remove dollar-sign for single commands without output
2016-11-10 14:54:49 -08:00
Gaetan 2ea564166d fix type of keywords entry in frontmatter (in /compose/ dir) (#481)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-07 13:18:56 -08:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Adrien Duermael 8fa5f3a5de absolute links to docs.docker.com are now relative links
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -07:00
Victoria Bialas 9c5319211d Fixing note formatting
Changing note format back to the way it was to match the rest of the notes in this section.
2016-10-26 16:58:24 -07:00
Victoria Bialas 568cded2a5 finishing touches on Wordpress example in Compose docs per pr#129
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-26 13:46:53 -07:00
Ivan Perez 3c41a34fd6 Typo in cd command
Fixes typo in command.

(If you named your directory `my_wordpress`, then you should cd into `my_wordpress`, not `my-wordpress`)
2016-10-18 20:44:36 +02:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones 7629f462d5 Moved compose docs to compose subdirectory 2016-09-28 14:52:24 -07:00