about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--docker-compose.yml4
-rw-r--r--docs/Running-Mastodon/Production-guide.md3
2 files changed, 3 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index e6002eaa5..68c8ef960 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,10 +2,10 @@ version: '2'
 services:
   db:
     restart: always
-    image: postgres
+    image: postgres:alpine
   redis:
     restart: always
-    image: redis
+    image: redis:alpine
   web:
     restart: always
     build: .
diff --git a/docs/Running-Mastodon/Production-guide.md b/docs/Running-Mastodon/Production-guide.md
index a6c776f09..f0dd7bd2b 100644
--- a/docs/Running-Mastodon/Production-guide.md
+++ b/docs/Running-Mastodon/Production-guide.md
@@ -95,7 +95,6 @@ Setup a user and database for Mastodon:
 In the prompt:
 
     CREATE USER mastodon CREATEDB;
-    CREATE DATABASE mastodon_production OWNER mastodon;
     \q
 
 ## Rbenv
@@ -210,7 +209,7 @@ Restart=always
 WantedBy=multi-user.target
 ```
 
-This allows you to `sudo systemctl enable mastodon-*.service` and `sudo systemctl start mastodon-*.service` to get things going.
+This allows you to `sudo systemctl enable /etc/systemd/system/mastodon-*.service` and `sudo systemctl start mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service` to get things going.
 
 ## Cronjobs