summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorBenedikt Heine <bebe@bebehei.de>2018-07-17 09:02:45 +0200
committerBenedikt Heine <bebe@bebehei.de>2018-07-17 09:24:33 +0200
commitfe089b13cbfb1eeb99de30378f01fdc71ca097c1 (patch)
treecea5ae041d410fa22bd603eefb68884682437b2c /contrib
parentMerge pull request #3530 from matrix-org/erikj/stream_cache (diff)
downloadsynapse-fe089b13cbfb1eeb99de30378f01fdc71ca097c1.tar.xz
[Docker] Build docker image via compose
It's much easier to build the image via docker-compose instead of an
error-prone low-level docker call.

Signed-off-by: Benedikt Heine <bebe@bebehei.de>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/docker/README.md8
-rw-r--r--contrib/docker/docker-compose.yml1
2 files changed, 2 insertions, 7 deletions
diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index 61592109cb..562cdaac2b 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -9,13 +9,7 @@ use that server.
 
 ## Build
 
-Build the docker image with the `docker build` command from the root of the synapse repository.
-
-```
-docker build -t docker.io/matrixdotorg/synapse .
-```
-
-The `-t` option sets the image tag. Official images are tagged `matrixdotorg/synapse:<version>` where `<version>` is the same as the release tag in the synapse git repository.
+Build the docker image with the `docker-compose build` command.
 
 You may have a local Python wheel cache available, in which case copy the relevant packages in the ``cache/`` directory at the root of the project.
 
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 0b531949e0..3a8dfbae34 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -6,6 +6,7 @@ version: '3'
 services:
 
   synapse:
+    build: ../..
     image: docker.io/matrixdotorg/synapse:latest
     # Since snyapse does not retry to connect to the database, restart upon
     # failure