Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)

[mastodon.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 103e10cbe32a3c9f5b51ae6532c0110942ebe912..cb49fda971969bbadfb96d2200dba8df60cea71b 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,24 @@
-version: '2'
+version: '3'
 services:
+
   db:
     restart: always
     image: postgres:alpine
-    volumes:
-      - ./postgres-data:/var/lib/postgresql/data
+### Uncomment to enable DB persistance
+#    volumes:
+#      - ./postgres:/var/lib/postgresql/data
+
   redis:
     restart: always
     image: redis:alpine
-    volumes:
-      - ./redis:/data
+### Uncomment to enable REDIS persistance
+#    volumes:
+#      - ./redis:/data
+
   web:
-    restart: always
     build: .
+    image: gargron/mastodon
+    restart: always
     env_file: .env.production
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     ports:
@@ -22,10 +28,13 @@ services:
       - redis
     volumes:
       - ./public/assets:/mastodon/public/assets
+      - ./public/packs:/mastodon/public/packs
       - ./public/system:/mastodon/public/system
+
   streaming:
-    restart: always
     build: .
+    image: gargron/mastodon
+    restart: always
     env_file: .env.production
     command: npm run start
     ports:
@@ -33,9 +42,11 @@ services:
     depends_on:
       - db
       - redis
+
   sidekiq:
-    restart: always
     build: .
+    image: gargron/mastodon
+    restart: always
     env_file: .env.production
     command: bundle exec sidekiq -q default -q mailers -q pull -q push
     depends_on: