Merge branch 'master' into gitea-rework

master
Jef Roosens 2021-12-24 17:37:14 +01:00
commit 5e5e8b5969
Signed by: Jef Roosens
GPG Key ID: 955C0660072F691F
2 changed files with 23 additions and 2 deletions

View File

@ -1,4 +1,4 @@
version: '3'
version: '3.4'
services:
app:
@ -52,7 +52,7 @@ services:
db:
image: 'postgres:14.1-alpine'
deploy:
mode: 'replicated'
replicas: 1
@ -60,6 +60,13 @@ services:
constraints:
- 'node.labels.class==gitea'
healthcheck:
test: pg_isready
interval: 30s
timeout: 5s
retries: 3
start_period: 15s
environment:
- 'POSTGRES_USER=gitea'
- 'POSTGRES_PASSWORD=gitea'

View File

@ -59,6 +59,13 @@ services:
placement:
constraints:
- 'node.labels.class==matrix'
healthcheck:
test: pg_isready
interval: 30s
timeout: 5s
retries: 3
start_period: 15s
environment:
- 'POSTGRES_DB=matrix_fb'
@ -109,6 +116,13 @@ services:
constraints:
- 'node.labels.class==matrix'
healthcheck:
test: pg_isready
interval: 30s
timeout: 5s
retries: 3
start_period: 15s
environment:
- 'POSTGRES_DB=matrix_signal'
- 'POSTGRES_USER=matrix_signal'