Merge commit '890c0c041' into dinsic

* commit '890c0c041':
  Update postgres in the Docker compose example to 12-alpine. (#7696)

2 files changed, 2 insertions, 1 deletions

diff --git a/changelog.d/7696.doc b/changelog.d/7696.doc
new file mode 100644

index 0000000000..d448bedc0b
--- /dev/null
+++ b/changelog.d/7696.doc
@@ -0,0 +1 @@
+Update postgres image in example `docker-compose.yaml` to tag `12-alpine`.
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml

index 17354b6610..d1ecd453db 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -50,7 +50,7 @@ services:
       - traefik.http.routers.https-synapse.tls.certResolver=le-ssl
 
   db:
-    image: docker.io/postgres:10-alpine
+    image: docker.io/postgres:12-alpine
     # Change that password, of course!
     environment:
       - POSTGRES_USER=synapse