summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2018-08-03 13:44:35 +0100
committerGitHub <noreply@github.com>2018-08-03 13:44:35 +0100
commitdf7f9871c1cb508635ed21c1602ec31a51f54666 (patch)
tree5cf81b7754c19266e1e9d6a30cbd1b603a514345 /README.rst
parentMerge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff)
parentUpdate README.md (diff)
downloadsynapse-df7f9871c1cb508635ed21c1602ec31a51f54666.tar.xz
Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_locations_v2
Refactor Dockerfile location
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst13
1 files changed, 10 insertions, 3 deletions
diff --git a/README.rst b/README.rst

index 5fdfad345f..4c5971d043 100644 --- a/README.rst +++ b/README.rst
@@ -157,12 +157,19 @@ if you prefer. In case of problems, please see the _`Troubleshooting` section below. -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`. +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 <contrib/docker>`_. Further information on +this including configuration options is available in the README on +hub.docker.com. -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/ +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 +tested with VirtualBox/AWS/DigitalOcean - see +https://github.com/EMnify/matrix-synapse-auto-deploy for details. Configuring synapse