From 90f70e0b688aa602893271905d115fe387def4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20L=C3=A1nsk=C3=BD?= Date: Wed, 9 May 2018 10:57:16 +0200 Subject: [PATCH] Adding copy config step (#596) * Adding copy config step As discussed in #591, docker will refuse to run the `mastodon:setup` step without some configuration file present. * The secret generation part of docker installation process As noticed in #6883, you need to generate the keys manually. * Setting correct file owner is important even in the prebuilt-image case ... as evidenced by issue #6911 * This step should not be necessary -- let's fix the installation instead --- Running-Mastodon/Docker-Guide.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Running-Mastodon/Docker-Guide.md b/Running-Mastodon/Docker-Guide.md index c3208bed..48d63041 100644 --- a/Running-Mastodon/Docker-Guide.md +++ b/Running-Mastodon/Docker-Guide.md @@ -28,18 +28,21 @@ If you're not making any local code changes or customizations on your instance, To use the prebuilt images: 1. Open `docker-compose.yml` in your favorite text editor. -2. Comment out the `build: .` lines for all images (web, streaming, sidekiq). -3. Edit the `image: tootsuite/mastodon` lines for all images to include the release you want. The default is `latest` which is the most recent stable version, however it recommended to explicitly pin a version: If you wanted to use v2.2.0 for example, you would edit the lines to say: `image: tootsuite/mastodon:v2.2.0` -4. Save the file and exit the text editor. -4. Run `docker-compose build`. It will now pull the correct image from Docker Hub. + 1. Comment out the `build: .` lines for all images (web, streaming, sidekiq). + 2. Edit the `image: tootsuite/mastodon` lines for all images to include the release you want. The default is `latest` which is the most recent stable version, however it recommended to explicitly pin a version: If you wanted to use v2.2.0 for example, you would edit the lines to say: `image: tootsuite/mastodon:v2.2.0` + 3. Save the file and exit the text editor. +2. Run `cp .env.production.sample .env.production` to bootstrap the configuration. You will need to edit this file later. +3. Run `docker-compose build`. It will now pull the correct image from Docker Hub. +4. Set correct file-owner with `chown -R 991:991 public` ### Building your own image You must build your own image if you've made any code modifications. To build your own image: 1. Open `docker-compose.yml` in your favorite text editor. -2. Uncomment the `build: .` lines for all images (web, streaming, sidekiq) if needed. -3. Save the file and exit the text editor. + 1. Uncomment the `build: .` lines for all images (web, streaming, sidekiq) if needed. + 2. Save the file and exit the text editor. +2. Run `cp .env.production.sample .env.production` to bootstrap the configuration. You will need to edit this file later. 3. Run `docker-compose build`. 4. Set correct file-owner with `chown -R 991:991 public`