Commit Graph

43 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
Aravind fa4b25cf64
Update to Posgtres instructions (#10982)
### Background
Newer upstream PostgreSQL Docker images, now require a password for use. If you were previously using passwordless access to a PostgreSQL DB, it will likely fail with an error.

This linked GitHub issue showcases the error: 
https://github.com/docker-library/postgres/issues/681

### Solution
The postgres docker page gives instructions on how to use the new image : https://hub.docker.com/_/postgres

There seems to be two different options we can take here :

Option 1 - Implement a password using the environment variable
Option 2 - Revert back to old behavior of having no password requirement

### Thoughts
Based on the team members remark it looks like increased security was the major reason for this breaking changing happening in a minor update.  Refer to this comment : https://github.com/docker-library/postgres/issues/681#issuecomment-586517154

As such I opted to use Option 1 here in this change as increased security of a DB is generally a win for every one in most cases.
2020-06-12 11:23:02 +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
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
charliemenke bf99b1999c
Update rails.md (#10271) 2020-02-12 10:14:56 +00:00
paigehargrave 0dab4ade68
Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
paigehargrave 2788fa1bf0
Update rails.md 2019-01-11 15:09:13 -05:00
Maria Bermudez 83fc215c81
Update rails.md 2019-01-02 18:38:28 -08:00
Maria Bermudez 44c4327630
Merge branch 'master' into compose-rails 2019-01-02 18:02:44 -08:00
Maria Bermudez 7d2f8cfc89 Fix merge conflicts and incorporate content feedback 2019-01-02 17:57:47 -08:00
Norman Kämper-Leymann 9c4ebb876c Update rails.md
Remove `restart: always` again.
2019-01-02 17:44:07 -05:00
Norman Kämper-Leymann 3238740467 Update rails.md
It occupied me quite a while figuring out why this sample didn't have a restart policy. And why we where supposed to always properly stop the containers wheres you normally would simply hit `Ctrl+C`.

Turned out that this `pid` issue is a rails-specific issue. https://github.com/docker/compose/issues/1393#issuecomment-99988242

And of course there's already [a Gem for fixing that](https://github.com/lorenzosinisi/shutup) but having the one-liner in the `docker-compose.yml` keeps the logic where it belongs to (and now also is treated here in the sample).
2019-01-02 17:44:07 -05:00
paigehargrave 6e8f675f25
Update rails.md 2019-01-02 17:27:34 -05:00
newoneforasn4 df5a088e39
Restructured sentence for better flow 2018-11-13 11:46:05 -08:00
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Takahiro Naito 247cde1bdb update rails.md for Ruby 2.5 and Rails 5.2 (#6771) 2018-06-01 09:00:21 -07:00
Norman Kämper-Leymann 4c36f67964 Update rails.md
Avoid running `docker-compose run web rake db:create` every time you restart/rebuild the app.
2018-03-02 11:11:08 -08:00
schalkwijk 589a83a38a Use correct HTML character reference for em dash (#5917)
Minor typo in the docs - `&#8212;` should be used for an [em dash](https://en.wikipedia.org/wiki/Dash#Common_dashes), not `&8212;`.
2018-02-05 09:35:49 -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
jottr 27b1e00875 USE COPY statement instead of ADD (#5336) 2017-11-20 10:02:20 -08:00
Jon-Michael Deldin 8cd94d3873 Fix test DB creation in Compose's database.yml (#3123)
Without the host and credentials, the `myapp_test` database is not
created, and instead, the user receives a PG error and a long backtrace.
This commit moves the credentials to a default anchor to share across
development and test environments.
2017-06-20 13:55:06 -07:00
Victoria Bialas bb8146180f Compose improvements, env_file vars, rails sample (#3517)
* added example for env_file variables

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

* copyedits and rework of Compose rails example

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-07 14:05:34 -07:00
Kasidesh Yontaradidthaworn 40db188f3f Update rails.md (#3421)
syntax error at Gemfile while compose run web rails new .
2017-06-02 09:54:40 -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 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
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
Hugo 7b83cfebab Update rails.md 2017-03-06 20:01:57 -05:00
Tarun Chinmai 06583c91d9 Changed the `rails` command to `rake`
changed `rails db:create` to `rake db:create`
2017-02-15 22:14:18 +05:30
Marko Schulz 107be08421 Small documentation fix
There are four files (`Dockerfile`, `Gemfile`, `Gemfile.lock`, `docker-compose.yml`) described for the setup.
2017-02-10 12:29:47 +01:00
Adam Stevenson 855e532435 Update db:create to use latest recommended format (#787)
Latest best practice is use `rails` vice `rake`.
http://guides.rubyonrails.org/command_line.html#db
2016-12-08 12:21:46 -08:00
Adam Stevenson 53da48206b Update to Rails 5, Ruby 2.3.3, remove therubyracer (#718)
* Update to Rails 5, Ruby 2.3.3, remove therubyracer

Update packages to latest versions. The actual nodejs is installed on line 18. Changed to a general comment regarding the need to rebuild images when adding gems.

* update rails welcome screenshot to 5.0.0.1
2016-11-29 13:52:16 -08:00
Ryan Ore a086af7a8b rails.md: change the database.yml in the example (#701)
In this example,  database.yml uses the default value of `postgres` for the `database` key.  
The database postgres is normally not used for user data, but for administrative purposes.  This means people following this example will not be able to drop the database, and in general it's just not a great idea.
2016-11-29 13:50:01 -08: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
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