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 18af16b6045c9663dd5cd42062f5291f7364a60f..cb49fda971969bbadfb96d2200dba8df60cea71b 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,34 +1,56 @@
-version: '2'
+version: '3'
 services:
+
   db:
-    image: postgres
+    restart: always
+    image: postgres:alpine
+### Uncomment to enable DB persistance
+#    volumes:
+#      - ./postgres:/var/lib/postgresql/data
+
   redis:
-    image: redis
-  neo4j:
-    image: neo4j
-    environment:
-      - NEO4J_AUTH=none
-  app:
+    restart: always
+    image: redis:alpine
+### Uncomment to enable REDIS persistance
+#    volumes:
+#      - ./redis:/data
+
+  web:
     build: .
+    image: gargron/mastodon
+    restart: always
     env_file: .env.production
-  web:
-    extends: app
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     ports:
       - "3000:3000"
     depends_on:
       - db
       - redis
-      - neo4j
     volumes:
       - ./public/assets:/mastodon/public/assets
+      - ./public/packs:/mastodon/public/packs
       - ./public/system:/mastodon/public/system
+
+  streaming:
+    build: .
+    image: gargron/mastodon
+    restart: always
+    env_file: .env.production
+    command: npm run start
+    ports:
+      - "4000:4000"
+    depends_on:
+      - db
+      - redis
+
   sidekiq:
-    extends: app
-    command: bundle exec sidekiq -q default -q mailers
+    build: .
+    image: gargron/mastodon
+    restart: always
+    env_file: .env.production
+    command: bundle exec sidekiq -q default -q mailers -q pull -q push
     depends_on:
       - db
       - redis
-      - neo4j
     volumes:
       - ./public/system:/mastodon/public/system