diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
| commit | 303f1c851fc363d3fc4fc4c91328abd89863341d (patch) | |
| tree | e8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /contrib/docker | |
| parent | fix known broken test (diff) | |
| parent | Merge pull request #3543 from bebehei/docker (diff) | |
| download | synapse-303f1c851fc363d3fc4fc4c91328abd89863341d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits
Diffstat (limited to 'contrib/docker')
| -rw-r--r-- | contrib/docker/README.md | 8 | ||||
| -rw-r--r-- | contrib/docker/docker-compose.yml | 1 |
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 |