Merge pull request #3778 from z3ntu/patch-1

Fix build of Docker image with docker-compose
2018-11-01 17:34:56 +00:00 · 2018-11-01 17:34:56 +00:00 · 3149d55b7d
parent c68aab1536 f8825748dd
commit 3149d55b7d
2 changed files with 5 additions and 2 deletions
--- a/changelog.d/3778.misc
+++ b/changelog.d/3778.misc
@ -0,0 +1 @@
+Fix build of Docker image with docker-compose
--- 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
				`@ -0,0 +1 @@`
				`Fix build of Docker image with docker-compose`