Merge branch 'master' of gitlab.com:rusty-bever/deployment

master
Jef Roosens 2022-08-25 14:19:02 +02:00
commit bdcdb82ef2
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
3 changed files with 39 additions and 39 deletions

View File

@ -10,9 +10,9 @@ ansible_become_pass: !vault |
6432
portainer:
version: 2.11.1
version: 2.13.1
domain: dock.rustybever.be
traefik:
version: 2.6.1
version: 2.7.2
acme_email: roosensjef@gmail.com

View File

@ -3,7 +3,7 @@ version: '3.4'
services:
app:
# Latest contains a development version
image: 'gitea/gitea:1.16.8'
image: 'gitea/gitea:1.17.0'
deploy:
mode: 'replicated'
@ -31,7 +31,7 @@ services:
- '/etc/localtime:/etc/localtime:ro'
db:
image: 'postgres:14.3-alpine'
image: 'postgres:14.4-alpine'
deploy:
mode: 'replicated'

View File

@ -150,45 +150,45 @@ services:
- 'irc:/data'
# =====DISCORD BRIDGE=====
discord:
image: 'dock.mau.dev/mautrix/discord:latest'
# discord:
# image: 'dock.mau.dev/mautrix/discord:latest'
deploy:
mode: 'replicated'
replicas: 1
placement:
constraints:
- 'node.labels.class==matrix'
# deploy:
# mode: 'replicated'
# replicas: 1
# placement:
# constraints:
# - 'node.labels.class==matrix'
networks:
- 'default'
- 'monitoring'
volumes:
- 'discord:/data'
# networks:
# - 'default'
# - 'monitoring'
# volumes:
# - 'discord:/data'
discord-db:
image: 'postgres:14.3-alpine'
# discord-db:
# image: 'postgres:14.3-alpine'
deploy:
mode: 'replicated'
replicas: 1
placement:
constraints:
- 'node.labels.class==matrix'
# deploy:
# mode: 'replicated'
# replicas: 1
# placement:
# constraints:
# - 'node.labels.class==matrix'
healthcheck:
test: pg_isready -U matrix_discord
interval: 30s
timeout: 5s
retries: 3
start_period: 15s
# healthcheck:
# test: pg_isready -U matrix_discord
# interval: 30s
# timeout: 5s
# retries: 3
# start_period: 15s
environment:
- 'POSTGRES_DB=matrix_discord'
- 'POSTGRES_USER=matrix_discord'
- 'POSTGRES_PASSWORD=matrix_discord'
volumes:
- 'discord-db:/var/lib/postgresql/data'
# environment:
# - 'POSTGRES_DB=matrix_discord'
# - 'POSTGRES_USER=matrix_discord'
# - 'POSTGRES_PASSWORD=matrix_discord'
# volumes:
# - 'discord-db:/var/lib/postgresql/data'
configs:
conduit_v7:
@ -208,5 +208,5 @@ volumes:
signald:
signal-db:
irc:
discord:
discord-db:
# discord:
# discord-db: