summary refs log tree commit diff
diff options
context:
space:
mode:
authorFridtjof Mund <2780577+fridtjof@users.noreply.github.com>2020-02-25 11:48:13 +0100
committerGitHub <noreply@github.com>2020-02-25 10:48:13 +0000
commit4aea0bd292bf9e33d166fcfd632159cfe35050dd (patch)
tree06e3be4fa656039f8d8fdd4557f39c7c4efc4922
parentRemove redundant store_room call (#6979) (diff)
downloadsynapse-4aea0bd292bf9e33d166fcfd632159cfe35050dd.tar.xz
contrib/docker: remove quotes for POSTGRES_INITDB_ARGS (#6984)
I made a mistake in https://github.com/matrix-org/synapse/pull/6921 - the quotes break the postgres container's startup script (or docker-compose), which makes initdb fail: https://github.com/matrix-org/synapse/pull/6921#issuecomment-590657154

Signed-off-by: Fridtjof Mund <fridtjof@das-labor.org>
-rw-r--r--changelog.d/6984.docker1
-rw-r--r--contrib/docker/docker-compose.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6984.docker b/changelog.d/6984.docker
new file mode 100644
index 0000000000..84a55e1267
--- /dev/null
+++ b/changelog.d/6984.docker
@@ -0,0 +1 @@
+Fix `POSTGRES_INITDB_ARGS` in the `contrib/docker/docker-compose.yml` example docker-compose configuration.
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 5df29379c8..453b305053 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -58,7 +58,7 @@ services:
       - POSTGRES_PASSWORD=changeme
       # ensure the database gets created correctly
       # https://github.com/matrix-org/synapse/blob/master/docs/postgres.md#set-up-database
-      - POSTGRES_INITDB_ARGS="--encoding=UTF-8 --lc-collate=C --lc-ctype=C"
+      - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
     volumes:
       # You may store the database tables in a local folder..
       - ./schemas:/var/lib/postgresql/data