Commit Graph

50 Commits

Author SHA1 Message Date
Usha Mandya 5be8260c40
Merge pull request #12461 from irlcatgirl/patch-1
Fix docker-compose database volume configuration
2021-03-18 15:04:33 +00:00
Catgirl 66c659a3e7
Add db volume information in docker-compose.yml 2021-03-08 15:55:03 -05:00
Stefan Scherer 8d2f2b639f
Django: Use docker ps to be in sync with the sample output
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-03-08 12:51:02 +01:00
Simon 5e78271505
TASK: Add codeblocks to code examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-04 12:06:54 +01:00
Adam Leskis 451612fd48 remove unnecessary commands
these lines aren't needed anymore, and add extra layers to the final image.
2020-11-11 20:03:47 +00:00
Sebastiaan van Stijn e3ef5c5085
machine: move overview page to /machine/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:44:05 +02:00
Sebastiaan van Stijn 393d3f6566
Add rel="noopener" to external links
See https://web.dev/external-anchors-use-rel-noopener/

Using noopener, as that addresses the security issue. "noreferer" blocks
the REFERER header, which may still be useful for some target URLs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-12 13:09:30 +02:00
Sebastiaan van Stijn f6adc80d9a
remove examples for ENV key value without '='
The `ENV key value` form can be ambiguous, for example, the following defines
a single env-variable (`ONE`) with value `"TWO= THREE=world"`:

    ENV ONE TWO= THREE=world

While we cannot deprecate/remove that syntax (as it would break existing
Dockerfiles), we should reduce exposure of the format in our examples.

Also updating some code-blocks that were missing language-hints

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 15:16:35 +02:00
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 ad5bd1a13c
Merge pull request #11204 from melaniemkwon/patch-1
Update quickstart Django example
2020-08-26 13:48:41 +01:00
Usha Mandya 1532bb4772 Fix md syntax 2020-08-12 09:56:06 +01:00
Mark Schmale ce341bd72f
Add note about setup being not viable for production (#11228)
* Add note about setup beeing not viable production

I think there should at least a small hint that this guide is just intended as a bare-bones development environment and should not at all be rolled into production like this. 
Relates to #7622

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-08-11 15:36:25 +01:00
Geetha Rangaswamaiah 77b7b73652 Fix compose docs grammatical errors 2020-08-06 12:49:26 +05:30
Melanie Kwon f256ba065b
Update quickstart Django example
Updating example from Django 2.x to Django 3.x
2020-07-31 08:49:41 -07:00
Kaden Weber 80b4f06fa2
Update django.md
typo
2020-07-09 10:55:44 -05:00
Usha Mandya e7899d34ed
Merge pull request #7349 from alioguzhan/patch-1
rename psycopg2 to psycopg2-binary
2020-07-01 13:59:03 +01: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
Young Jin Ahn c36fb459e1
update postgres initialization for compose/django.md (#10624)
* update postgres initialization for compose/django.md

* omitted code blocks with postgres ports & comments
2020-04-16 10:07:03 +01: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
Ali Oğuzhan Yıldız f2349251f1
Merge branch 'master' into patch-1 2019-09-25 23:10:41 +03:00
Daniel Compton 59eec9832b
Remove leading whitespace in code blocks from Django docs 2019-01-30 15:20:43 +13:00
Maria Bermudez 565537843b
Merge pull request #6725 from 2tunnels/patch-1
update compose django example
2019-01-15 16:57:40 -08:00
paigehargrave 92e6fb2039
Update django.md 2019-01-11 15:05:51 -05:00
Jeffrey Morgan ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
Ali Oğuzhan Yıldız 9031360ae7
rename psycopg2 to psycopg2-binary 2018-09-11 13:23:10 +03:00
Vlad Dm 0d21824e3c update compose django example 2018-05-19 16:07:15 +03: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
chan24092005 b2663493d1 Update django.md (#5477)
docker-compose should run with `sudo`, otherview it will be fail without the sudo permission
2017-12-11 13:32:40 -08:00
chan24092005 2230bedd84 Update django.md (#5476)
remove the extra s in `Dockerfiles`
2017-12-11 13:30:43 -08:00
Victoria Bialas a922be3d0f Update admonitions CSS for consistency and better writer workflow (#4019) 2017-07-31 21:49:56 -07:00
Misty Stanley-Jones 17e1da077b Tighten up base image and parent image terminology (#3720) 2017-06-28 11:56:41 -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
Germán Larraín 958fb121b0 django.md: fix Python image version (#2991)
Dockerfile's base image was not consistent the the explanation below.
2017-04-21 23:59:02 -07:00
Julien Maitrehenry 3edabae435 Fix manager and worker join tokens
* Fix manager and worker join tokens. Issue #2088.

Fix screenshots per issue #2126

Move vote images to correct dir

Fix rendering issue with inline code snippet #1990

Fix for stack yaml reference (#1476)

Fix image link

Add shutdown procedures for #1017

* Make the fix asked in the PR

Little fix
2017-04-21 14:05:12 -05:00
Cory Locklear fb33155fc7 Fixes #1097. Add alert for potential edit of settings.py for ALLOWED_HOSTS for Windows 10 (#2886) 2017-04-20 12:07:58 -05:00
Suraj Narwade db6a60b806 Fixed django example (#2914)
Resolves #2468
2017-04-19 14:18:05 -05:00
Alex Urquhart 8b1117ad58 Update django.md
Fixed typo
2017-01-23 09:21:17 -05:00
Sergei b0ccda058e typo fixed 2016-12-28 23:06:39 +07:00
Misty Stanley-Jones 756f4d974c Fix some doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 11:32:17 -08: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
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
DavidRabel-b1 673523ee9a Update django.md
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .

See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
2016-10-19 17:07:49 +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