Update gitea containers to use journald logging

This replaces syslog logging for containes with journald. Our syslog
rules for /var/log/containers/ log files should continue working because
journald emits to syslog. This is in preparation for an eventual docker
compose backed by podman setup on newer platforms.

We also update the haproxy role as gitea relies on it. This will also
side effect zuul web service.

Change-Id: I00bbc79a2196aebbd5c5da1b740eae395a97c9c4
This commit is contained in:
Clark Boylan 2024-12-12 14:23:48 -08:00
parent 69e14c25c8
commit d9e8844f8d
2 changed files with 5 additions and 5 deletions

View File

@ -17,7 +17,7 @@ services:
- /var/gitea/db:/var/lib/mysql
- /var/gitea/conf/99-max_conn_my.cnf:/etc/mysql/conf.d/99-max_conn_my.cnf:ro
logging:
driver: syslog
driver: journald
options:
tag: "docker-mariadb"
gitea-web:
@ -39,7 +39,7 @@ services:
- /var/gitea/logs:/logs
- /var/gitea/certs:/certs
logging:
driver: syslog
driver: journald
options:
tag: "docker-gitea"
gitea-ssh:
@ -56,6 +56,6 @@ services:
- /var/gitea/conf:/custom/conf
- /var/gitea/logs:/logs
logging:
driver: syslog
driver: journald
options:
tag: "docker-gitea-ssh"

View File

@ -39,7 +39,7 @@ services:
- /var/haproxy/etc:/usr/local/etc/haproxy:ro
- /var/haproxy/run:/var/haproxy/run
logging:
driver: syslog
driver: journald
options:
tag: "docker-haproxy"
@ -55,7 +55,7 @@ services:
STATSD_HOST: graphite.opendev.org
STATSD_PORT: 8125
logging:
driver: syslog
driver: journald
options:
tag: "docker-haproxy-statsd"
{% endif %}