Commit Graph

49 Commits

Author SHA1 Message Date
Usha Mandya f57bd0b321
Merge pull request #10717 from thaJeztah/compose_samples
compose: add WordPress example to TOC
2020-09-08 16:29:31 +01:00
Usha Mandya 675bdedd1f
Add info about the Expose command (#11137) 2020-07-15 12:36:51 +02:00
Vemuluru Venkata Sri Harsha 39fe7accba
Update gettingstarted.md (#11094)
* Update gettingstarted.md

1. Flask app was running in the wrong port.
2. 5000 port was not exposed in Dockerfile

* Update gettingstarted.md

mistook Redis port to flask port.
2020-07-13 17:06:02 +02:00
Sebastiaan van Stijn 9f4db87055
compose: add WordPress example to TOC
Also removes links to individual examples, instead linking
to the "compose samples" page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-28 14:35:50 +02:00
Sebastiaan van Stijn 0f3caaca6a
compose: use relative markdown links
Unfortunately, the only reliable way to create internal links
is to use relative links to other Markdown files. This does
match the way links on GitHub work, but makes it harder to
create these links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:10 +02:00
Sebastiaan van Stijn d813acb6e1
Engine: reorganize install topic
- Move getting started overview to /get-started/overview/
- Move engine installation files under /engine/
- Redirect the top-level /install/ to /get-docker/
- Updated titles in left-hand navigation
- Added back some pages to the navigation that were
  currently not included.
- Reduce some steps in the installation pages
- Move devicemapper prerequisites to the devicemapper
  storage driver page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-06 10:50:28 +02:00
Sebastiaan van Stijn 331554f4b3
Fix various links that were generating URLs with `.md` (#10548)
* Fix incorrect links in compose section

there's a bug causing wrapped links to not work, and replacing
some links to point to the .md file, so that IDE's can check
if the anchors are valid. Also replaced some links to point
to their new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* engine/swarm: update links

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Fix various broken links

There's a bug in the "jekyll-relative-links" plugin that causes wrapped links to not work.
Also replacing some links to point to the .md file, so that IDE's can check if the anchors
are valid. Finally, replaced some links to point to their new locations, so that users don't
get redirected..

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-01 12:05:50 +01:00
Usha Mandya ac099018c1
Merge pull request #8609 from davidism/patch-1
Update Python and Flask usage in Compose tutorial
2019-05-23 09:54:13 +01:00
K-Sato 07a089f27d Add an indentation in compose-gettingstarted.md (#8487)
* Add an indentation

* Fix messaging on service dependencies
2019-05-07 18:16:29 -07:00
David Lord f5da7af31f
add gcc so markupsafe compiles speedups 2019-04-11 09:57:44 -07:00
David Lord 34fe3db007
remove 0.0.0.0 url 2019-04-11 09:48:27 -07:00
David Lord 6f2e3d389d
remove unused `app.run()` call
This is not needed when using the recommended `flask run`
command to run the development server.
2019-04-07 02:12:35 -07:00
David Lord 86f716623f
update python and flask usage in dockerfile
* Uses the modern Python 3.7 image, as 3.4 is EOL.
* Separates copying and installing requirements from copying
  project, to make rebuilds more efficient.
* Uses the recommended `flask run` command. This is especially
  needed on Windows, where `app.py` incorrectly looks like an
  executable file when copying into Docker.
* Uses the `FLASK_ENV` env var to control development mode.
2019-04-07 02:02:29 -07:00
paigehargrave 661100cce2
Update gettingstarted.md 2019-01-11 13:15:16 -05:00
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07:00
Yang Luo e74fd60201 Add the missing backtick 2018-06-28 15:26:03 -07:00
Misty Stanley-Jones a55ddf60a9
Move /engine/installation to /install (#5651)
* Move /engine/installation to /install

* Add Docker for IBM Cloud to the matrix
2018-01-26 10:29:14 -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
Joffrey F 1f36a5274f Update getting started guide with retry-loop and short explanation (#5635)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-27 12:59:22 -08:00
x1ah 310a9f8f8c fix docker-compose.yml have not link redis (#5602)
rt, if web have not link redis, `redis = Redis(host='redis', port=6379)` will can not recognize the host('redis')
2017-12-26 12:52:27 -08:00
Wang Jie ca4b8b90e6 Update gettingstarted.md (#4985) 2017-10-16 16:58:58 -07:00
Gwendolynne Barr 34cd249844 Improvements to Getting Started content for Compose (#4617) 2017-09-13 16:55:51 -07:00
Victoria Bialas 0f802e1b76 Update Compose quick-start to show static loaded image, then volume mount (#4255)
* re-org sample to show static loaded image, then using a volume mounte

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

* review comments from mstanleyjones and joaofnfernandes

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

* added a sub-step to make the workflow and output make sense

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

* combined notes about shared drives and volumes, reorganized topic order

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-18 12:09:24 -07:00
John Mulhausen c7bc5c3d0e Fixes #4149 2017-08-14 13:34:47 -07:00
Keisuke Izumiya f4c41f2b2e Fix version number (#4134) 2017-08-10 16:12:17 -07:00
Victoria Bialas 5a610f6367 Compose examples (#3346)
* improve Compose rails sample

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

* updated file list and commands based on feedback for no skip-bundle

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

* added, start, stop, rebuild info to Rails sample

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

* updated info re: default Flask port for compose get started

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

* more changes for rebuilding steps

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

* added rebuild info

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

* added info about Gemfile.lock to rebuild steps

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-23 23:26:57 -07:00
Victoria Bialas 71b91bd468 add detail on redis default port
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-01 15:56:50 -07:00
Suraj Narwade e7c16b5fdc separate out the links (#2935)
* separate out the links

resolves #2934

* Update gettingstarted.md
2017-04-20 15:00:32 -05:00
Victoria Bialas 5f14289a3f added note re: VitualBox bug and Compose example (#2652)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-06 13:41:12 -07:00
Wang Jie a5502b4235 Update gettingstarted.md (#2576) 2017-03-31 14:22:01 -07:00
Derek Bender 330ed3d24a fixup compose-file/index.md link (#2347) 2017-03-15 09:56:17 -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 19b5b6ad9e clarified getting started Compose topics based on user feedback
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 11:49:52 -08:00
Aanand Prasad b08c014fd8 Updates to Compose getting started guide
- Some wording and formatting tweaks
- Use Python 3.4, because it's 2016
- Use Alpine-based images for faster downloads and less disk space usage
- Use the list form of `CMD` in the Dockerfile, so it's not wrapped in
  sh
- Remove the `depends_on` from `docker-compose.yml`, as it's not really
  needed - the web app connects to Redis when it's visited, not on
  startup
- Add a section on updating the app and seeing the changes, because
  that's the point of mounting the code in!
- Add a note about `docker-compose down`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-22 16:33:43 +00:00
Victoria Bialas 1249d35fca added troubleshooting info about shared drives/files and volume mounting
added more changes

updated per Nathan's comments on properly documenting directories formats for all platforms

incorporated Daniel's review comments, and added a clarification re: users' dir

copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-16 11:02:04 -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
Victoria Bialas 50d7898fe4 Update gettingstarted.md 2016-10-25 11:22:30 -07:00
Victoria Bialas 100a82043a Update gettingstarted.md 2016-10-25 11:18:39 -07:00
BSCheshir 1b8729c5be remove prefix space
strange space on ALL code block on https://docs.docker.com/compose/gettingstarted/

but github clear it on preview .md
2016-10-07 23:18:45 +04: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