opendev/system-config
Code Issues Proposed changes

Merge "Upgrade Etherpad's MariaDB to 10.11"

Browse Source
This commit is contained in:
Zuul 2024-04-17 20:23:23 +00:00 committed by Gerrit Code Review
commit a89fab4a40
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/roles/etherpad/templates/docker-compose.yaml.j2
View File

@ -4,7 +4,7 @@ version: '2'
services: services:
mariadb: mariadb:
image: docker.io/library/mariadb:10.4 image: docker.io/library/mariadb:10.11
network_mode: host network_mode: host
restart: always restart: always
environment: environment:
@ -12,6 +12,7 @@ services:
MYSQL_DATABASE: etherpad-lite MYSQL_DATABASE: etherpad-lite
MYSQL_USER: "{{ etherpad_db_user }}" MYSQL_USER: "{{ etherpad_db_user }}"
MYSQL_PASSWORD: "{{ etherpad_db_password }}" MYSQL_PASSWORD: "{{ etherpad_db_password }}"
MARIADB_AUTO_UPGRADE: 1
volumes: volumes:
- /var/etherpad/db:/var/lib/mysql - /var/etherpad/db:/var/lib/mysql
- /etc/etherpad/mysql:/etc/mysql/conf.d - /etc/etherpad/mysql:/etc/mysql/conf.d

2
testinfra/test_etherpad.py
View File

@ -34,7 +34,7 @@ def test_etherpad_logs(host):
mariadb_log_file = host.file('/var/log/containers/docker-mariadb.log') mariadb_log_file = host.file('/var/log/containers/docker-mariadb.log')
assert mariadb_log_file.exists assert mariadb_log_file.exists
assert mariadb_log_file.contains('mysqld: ready for connections') assert mariadb_log_file.contains('mariadbd: ready for connections.')
def test_etherpad_4_byte_utf8(host): def test_etherpad_4_byte_utf8(host):
# The 🖖 utf8 character is a four byte character. This test ensures we # The 🖖 utf8 character is a four byte character. This test ensures we