Merge branch 'master' into gitea-rework
commit
5e5e8b5969
|
@ -1,4 +1,4 @@
|
||||||
version: '3'
|
version: '3.4'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
|
@ -52,7 +52,7 @@ services:
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: 'postgres:14.1-alpine'
|
image: 'postgres:14.1-alpine'
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
mode: 'replicated'
|
mode: 'replicated'
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
@ -60,6 +60,13 @@ services:
|
||||||
constraints:
|
constraints:
|
||||||
- 'node.labels.class==gitea'
|
- 'node.labels.class==gitea'
|
||||||
|
|
||||||
|
healthcheck:
|
||||||
|
test: pg_isready
|
||||||
|
interval: 30s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
start_period: 15s
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- 'POSTGRES_USER=gitea'
|
- 'POSTGRES_USER=gitea'
|
||||||
- 'POSTGRES_PASSWORD=gitea'
|
- 'POSTGRES_PASSWORD=gitea'
|
||||||
|
|
|
@ -59,6 +59,13 @@ services:
|
||||||
placement:
|
placement:
|
||||||
constraints:
|
constraints:
|
||||||
- 'node.labels.class==matrix'
|
- 'node.labels.class==matrix'
|
||||||
|
|
||||||
|
healthcheck:
|
||||||
|
test: pg_isready
|
||||||
|
interval: 30s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
start_period: 15s
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- 'POSTGRES_DB=matrix_fb'
|
- 'POSTGRES_DB=matrix_fb'
|
||||||
|
@ -109,6 +116,13 @@ services:
|
||||||
constraints:
|
constraints:
|
||||||
- 'node.labels.class==matrix'
|
- 'node.labels.class==matrix'
|
||||||
|
|
||||||
|
healthcheck:
|
||||||
|
test: pg_isready
|
||||||
|
interval: 30s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
start_period: 15s
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- 'POSTGRES_DB=matrix_signal'
|
- 'POSTGRES_DB=matrix_signal'
|
||||||
- 'POSTGRES_USER=matrix_signal'
|
- 'POSTGRES_USER=matrix_signal'
|
||||||
|
|
Loading…
Reference in New Issue