diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:42:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:42:10 -0400 |
commit | 065defefac7f1e7e05190f7853699dae9ecbf37a (patch) | |
tree | 5fff3fb0e831c54989604c8ef5f085e13f76a323 /README.md | |
parent | 9a534d1df639ccd462d0c1f0b2faee0734daab8d (diff) | |
parent | 6bfe0689047644743061cfc217a7a64e46c36a87 (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/README.md b/README.md index 20499e6e3..9b43e8077 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ Consult the example configuration file, `.env.production.sample` for the full li ## Running with Docker and Docker-Compose +[![](https://images.microbadger.com/badges/version/gargron/mastodon.svg)](https://microbadger.com/images/gargron/mastodon "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/gargron/mastodon.svg)](https://microbadger.com/images/gargron/mastodon "Get your own image badge on microbadger.com") + The project now includes a `Dockerfile` and a `docker-compose.yml`. You need to turn `.env.production.sample` into `.env.production` with all the variables set before you can: docker-compose build @@ -117,6 +119,12 @@ Which will re-create the updated containers, leaving databases and data as is. D Docker is great for quickly trying out software, but it has its drawbacks too. If you prefer to run Mastodon without using Docker, refer to the [production guide](docs/Running-Mastodon/Production-guide.md) for examples, configuration and instructions. +## Deployment on Scalingo + +[![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/tootsuite/mastodon#master) + +[You can view a guide for deployment on Scalingo here.](docs/Running-Mastodon/Scalingo-guide.md) + ## Deployment on Heroku (experimental) [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) |