about summary refs log tree commit diff
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-10-15 12:38:28 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-15 12:38:28 +0200
commit70ab6624f5f397ddd05136db2fa37c902f0867eb (patch)
tree72407fd4b5368d3e8cdfd4c85ae928a654d8d261 /docker-compose.yml
parent91144d46ecc1a6e2d39abe8bea2d62c5cb57aca3 (diff)
parent4d336ceface783c255e62220cfa76812630ff1a1 (diff)
Merge branch 'feature-suggestions' into development
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index b3b233713..18af16b60 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,10 @@ services:
     image: postgres
   redis:
     image: redis
+  neo4j:
+    image: neo4j
+    environment:
+      - NEO4J_AUTH=none
   app:
     build: .
     env_file: .env.production
@@ -15,6 +19,7 @@ services:
     depends_on:
       - db
       - redis
+      - neo4j
     volumes:
       - ./public/assets:/mastodon/public/assets
       - ./public/system:/mastodon/public/system
@@ -24,5 +29,6 @@ services:
     depends_on:
       - db
       - redis
+      - neo4j
     volumes:
       - ./public/system:/mastodon/public/system