summary refs log tree commit diff
path: root/contrib/docker/docker-compose.yml
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-11-01 17:34:56 +0000
committerGitHub <noreply@github.com>2018-11-01 17:34:56 +0000
commit3149d55b7d2103953eca83595d135f979f710b86 (patch)
treecb1541aa4c8d68900e855766d26c6c498512d072 /contrib/docker/docker-compose.yml
parentMerge pull request #4004 from matrix-org/travis/login-terms (diff)
parentchangelog.d entry somehow got lost (diff)
downloadsynapse-3149d55b7d2103953eca83595d135f979f710b86.tar.xz
Merge pull request #3778 from z3ntu/patch-1
Fix build of Docker image with docker-compose
Diffstat (limited to 'contrib/docker/docker-compose.yml')
-rw-r--r--contrib/docker/docker-compose.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index b1f6fcb7da..2c1f0671b2 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -6,9 +6,11 @@ version: '3'
 services:
 
   synapse:
-    build: ../..
+    build:
+        context: ../..
+        dockerfile: docker/Dockerfile
     image: docker.io/matrixdotorg/synapse:latest
-    # Since snyapse does not retry to connect to the database, restart upon
+    # Since synapse does not retry to connect to the database, restart upon
     # failure
     restart: unless-stopped
     # See the readme for a full documentation of the environment settings