From 131bd5e06cf2399e1cccc20ee9258a300143d777 Mon Sep 17 00:00:00 2001 From: Fabian Meyer Date: Tue, 7 Jan 2020 18:38:51 +0100 Subject: [PATCH 1/4] fixing mount that overrides containers /etc 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. --- contrib/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml index 72c87054e56b..2b044baf7813 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 From ee99f16437fd08e8ead745de3a3ad269977105e9 Mon Sep 17 00:00:00 2001 From: Fabian Meyer Date: Tue, 7 Jan 2020 18:49:58 +0100 Subject: [PATCH 2/4] add changelog --- changelog.d/6656.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6656.bugfix diff --git a/changelog.d/6656.bugfix b/changelog.d/6656.bugfix new file mode 100644 index 000000000000..4ce318df3073 --- /dev/null +++ b/changelog.d/6656.bugfix @@ -0,0 +1 @@ +No more overriding the entire /etc folder of the container in docker-compose.yaml. Contributed by Fabian Meyer From 9f7176525c6858a2f6d50f6103798683652c5838 Mon Sep 17 00:00:00 2001 From: Fabian Meyer Date: Tue, 7 Jan 2020 18:53:17 +0100 Subject: [PATCH 3/4] add missing . to the end of the changelog --- changelog.d/6656.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/6656.bugfix b/changelog.d/6656.bugfix index 4ce318df3073..9f32da1a8889 100644 --- a/changelog.d/6656.bugfix +++ b/changelog.d/6656.bugfix @@ -1 +1 @@ -No more overriding the entire /etc folder of the container in docker-compose.yaml. Contributed by Fabian Meyer +No more overriding the entire /etc folder of the container in docker-compose.yaml. Contributed by Fabian Meyer. From a0f66ee8e166ae2e3383500b7ac20d437beee5c7 Mon Sep 17 00:00:00 2001 From: Fabian Meyer Date: Wed, 8 Jan 2020 07:04:12 +0100 Subject: [PATCH 4/4] rename changelog suffix from bugfix to doc --- changelog.d/{6656.bugfix => 6656.doc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{6656.bugfix => 6656.doc} (100%) diff --git a/changelog.d/6656.bugfix b/changelog.d/6656.doc similarity index 100% rename from changelog.d/6656.bugfix rename to changelog.d/6656.doc