From 2f7ebc2a559409abca9424bfb02cb287c4a21dc6 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 27 Jun 2019 13:49:48 +0100
Subject: Deprecate the env var way of running the docker image (#5566)

This is mostly a documentation change, but also adds a default value for
SYNAPSE_CONFIG_PATH, so that running from the generated config is the default,
and will Just Work provided your config is in the right place.
---
 contrib/docker/README.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'contrib')

diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index 05254e5192..af102f7594 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -1,5 +1,9 @@
 # Synapse Docker
 
+FIXME: this is out-of-date as of
+https://github.com/matrix-org/synapse/issues/5518. Contributions to bring it up
+to date would be welcome.
+
 ### Automated configuration
 
 It is recommended that you use Docker Compose to run your containers, including
-- 
cgit 1.4.1