summary refs log tree commit diff
path: root/contrib/docker
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:22:47 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:22:47 -0700
commit09ddede03d4a57ec8b90bc8109a62caca85b99ea (patch)
treecd83cced89f78396c2db770d058ad17bee48ba90 /contrib/docker
parentMerge commit '46613aaf7' into dinsic (diff)
parentUpdate postgres in the Docker compose example to 12-alpine. (#7696) (diff)
downloadsynapse-09ddede03d4a57ec8b90bc8109a62caca85b99ea.tar.xz
Merge commit '890c0c041' into dinsic
* commit '890c0c041':
  Update postgres in the Docker compose example to 12-alpine. (#7696)
Diffstat (limited to 'contrib/docker')
-rw-r--r--contrib/docker/docker-compose.yml2
1 files changed, 1 insertions, 1 deletions
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