about summary refs log tree commit diff
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-24 23:46:27 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-24 23:46:27 +0100
commit8efa081f210d72ed450c39ac4cde0fd84fb3d3fb (patch)
tree8be3c14b6b5e94d3d8ce7093bf7117bd7c87e346 /docker-compose.yml
parentfca183968e4a868c8930ba3ac8fe22cef0c07f54 (diff)
Remove Neo4J
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml15
1 files changed, 2 insertions, 13 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f9126805..3392dd242 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,16 +6,9 @@ services:
   redis:
     restart: always
     image: redis
-  neo4j:
-    restart: always
-    build:
-      context: .
-      dockerfile: Dockerfile.neo4j
   web:
     restart: always
-    build:
-      context: .
-      dockerfile: Dockerfile.app
+    build: .
     env_file: .env.production
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     ports:
@@ -23,20 +16,16 @@ services:
     depends_on:
       - db
       - redis
-      - neo4j
     volumes:
       - ./public/assets:/mastodon/public/assets
       - ./public/system:/mastodon/public/system
   sidekiq:
     restart: always
-    build:
-      context: .
-      dockerfile: Dockerfile.app
+    build: .
     env_file: .env.production
     command: bundle exec sidekiq -q default -q mailers
     depends_on:
       - db
       - redis
-      - neo4j
     volumes:
       - ./public/system:/mastodon/public/system