From a40802bcbc2838033ecfe468d7845adbb1f3cbb7 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Fri, 31 Aug 2018 14:40:17 +0200
Subject: [PATCH] Fix build of Docker image with docker-compose
... and fix a typo
---
contrib/docker/docker-compose.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 3a8dfbae34..61ec700afd 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
--
GitLab