diff options
| author | Neil Johnson <neil@matrix.org> | 2018-05-18 14:07:50 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-05-18 14:07:50 +0100 |
| commit | 2725223f0818396665b49463c4d65c68e969c8fa (patch) | |
| tree | b2793e28392774fe7386d1a2ff8781b336af258e /README.rst | |
| parent | Merge pull request #3232 from matrix-org/rav/server_notices_room (diff) | |
| parent | Merge tag 'v0.29.1' (diff) | |
| download | synapse-2725223f0818396665b49463c4d65c68e969c8fa.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/README.rst b/README.rst index 28fbe45de6..4fe54b0c90 100644 --- a/README.rst +++ b/README.rst @@ -157,8 +157,9 @@ if you prefer. In case of problems, please see the _`Troubleshooting` section below. -Alternatively, Andreas Peters (previously Silvio Fricke) has contributed a Dockerfile to automate the -above in Docker at https://hub.docker.com/r/avhost/docker-matrix/tags/ +There is an offical synapse image available at https://hub.docker.com/r/matrixdotorg/synapse/tags/ which can be used with the docker-compose file available at `contrib/docker`. Further information on this including configuration options is available in `contrib/docker/README.md`. + +Alternatively, Andreas Peters (previously Silvio Fricke) has contributed a Dockerfile to automate a synapse server in a single Docker image, at https://hub.docker.com/r/avhost/docker-matrix/tags/ Also, Martin Giess has created an auto-deployment process with vagrant/ansible, tested with VirtualBox/AWS/DigitalOcean - see https://github.com/EMnify/matrix-synapse-auto-deploy |