summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Meyer <f@bian-meyer.de>2020-01-08 08:25:05 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-01-08 07:25:05 +0000
commitdd57715de2b9a0742b38aaab63893e2495b68841 (patch)
tree4a6580ce320c1850b5d51b2d4f47fda352ba2274
parenttypo (diff)
downloadsynapse-dd57715de2b9a0742b38aaab63893e2495b68841.tar.xz
contrib/docker-compose: fixing mount that overrides containers' /etc (#6656)
The mount in the form of ./matrix-config:/etc overwrites the contents of the container /etc folder. Since all valid ca certificates are stored in /etc, the synapse.push.httppusher, for example, cannot validate the certificate from matrix.org.
-rw-r--r--changelog.d/6656.doc1
-rw-r--r--contrib/docker/docker-compose.yml2
2 files changed, 2 insertions, 1 deletions
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