summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-20 17:00:41 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-20 17:00:41 +0000
commita7a73bbbd824cc01a33ff9d8365b797f4a9154c1 (patch)
tree0dabc887ba63c2b060ebf88f9de9925f52c1de7f
parentCorrectly proxy remote group HTTP errors. (#6654) (diff)
parent contrib/docker-compose: fixing mount that overrides containers' /etc (#6656) (diff)
downloadsynapse-a7a73bbbd824cc01a33ff9d8365b797f4a9154c1.tar.xz
contrib/docker-compose: fixing mount that overrides containers' /etc (#6656)
* commit 'dd57715de':
  contrib/docker-compose: fixing mount that overrides containers' /etc (#6656)
  typo
-rw-r--r--CHANGES.md2
-rw-r--r--changelog.d/6656.doc1
-rw-r--r--contrib/docker/docker-compose.yml2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md

index df94f742c0..24da66c596 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -6,7 +6,7 @@ Features - Add v2 APIs for the `send_join` and `send_leave` federation endpoints (as described in [MSC1802](https://github.com/matrix-org/matrix-doc/pull/1802)). ([\#6349](https://github.com/matrix-org/synapse/issues/6349)) - Add a develop script to generate full SQL schemas. ([\#6394](https://github.com/matrix-org/synapse/issues/6394)) -- Add custom SAML username mapping functinality through an external provider plugin. ([\#6411](https://github.com/matrix-org/synapse/issues/6411)) +- Add custom SAML username mapping functionality through an external provider plugin. ([\#6411](https://github.com/matrix-org/synapse/issues/6411)) - Automatically delete empty groups/communities. ([\#6453](https://github.com/matrix-org/synapse/issues/6453)) - Add option `limit_profile_requests_to_users_who_share_rooms` to prevent requirement of a local user sharing a room with another user to query their profile information. ([\#6523](https://github.com/matrix-org/synapse/issues/6523)) - Add an `export_signing_key` script to extract the public part of signing keys when rotating them. ([\#6546](https://github.com/matrix-org/synapse/issues/6546)) diff --git a/changelog.d/6656.doc b/changelog.d/6656.doc new file mode 100644
index 0000000000..9f32da1a88 --- /dev/null +++ b/changelog.d/6656.doc
@@ -0,0 +1 @@ +No more overriding the entire /etc folder of the container in docker-compose.yaml. Contributed by Fabian Meyer. diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 72c87054e5..2b044baf78 100644 --- a/contrib/docker/docker-compose.yml +++ b/contrib/docker/docker-compose.yml
@@ -18,7 +18,7 @@ services: - SYNAPSE_CONFIG_PATH=/etc/homeserver.yaml volumes: # You may either store all the files in a local folder - - ./matrix-config:/etc + - ./matrix-config/homeserver.yaml:/etc/homeserver.yaml - ./files:/data # .. or you may split this between different storage points # - ./files:/data