Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-22 20:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(run) Fix templates for mariadb

Browse Source 
Apparently the docker image contract changed at some point, and now we should spawn mariadbd and not mysqld; mariadb-admin and not mysqladmin.
This commit is contained in:
Viktor Lofgren 2025-01-16 15:27:02 +01:00
parent de2feac238
commit bc818056e6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run/install/barebones-1/docker-compose.yml.template
View File

@ -72,11 +72,11 @@ services:
image: "mariadb:lts" image: "mariadb:lts"
container_name: "mariadb" container_name: "mariadb"
env_file: "${INSTALL_DIR}/env/mariadb.env" env_file: "${INSTALL_DIR}/env/mariadb.env"
command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci'] command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
ports: ports:
- "127.0.0.1:3306:3306/tcp" - "127.0.0.1:3306:3306/tcp"
healthcheck: healthcheck:
test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval} test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
start_period: 5s start_period: 5s
interval: 5s interval: 5s
timeout: 5s timeout: 5s

4
run/install/barebones-2/docker-compose.yml.template
View File

@ -103,11 +103,11 @@ services:
image: "mariadb:lts" image: "mariadb:lts"
container_name: "mariadb" container_name: "mariadb"
env_file: "${INSTALL_DIR}/env/mariadb.env" env_file: "${INSTALL_DIR}/env/mariadb.env"
command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci'] command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
ports: ports:
- "127.0.0.1:3306:3306/tcp" - "127.0.0.1:3306:3306/tcp"
healthcheck: healthcheck:
test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval} test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
start_period: 5s start_period: 5s
interval: 5s interval: 5s
timeout: 5s timeout: 5s

4
run/install/marginalia-prod-like/docker-compose.yml.template
View File

@ -129,11 +129,11 @@ services:
image: "mariadb:lts" image: "mariadb:lts"
container_name: "mariadb" container_name: "mariadb"
env_file: "${INSTALL_DIR}/env/mariadb.env" env_file: "${INSTALL_DIR}/env/mariadb.env"
command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci'] command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
ports: ports:
- "127.0.0.1:3306:3306/tcp" - "127.0.0.1:3306:3306/tcp"
healthcheck: healthcheck:
test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval} test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
start_period: 5s start_period: 5s
interval: 5s interval: 5s
timeout: 5s timeout: 5s

4
run/install/no-docker/docker-compose.yml.template
View File

@ -3,11 +3,11 @@ services:
image: "mariadb:lts" image: "mariadb:lts"
container_name: "mariadb" container_name: "mariadb"
env_file: "${INSTALL_DIR}/env/mariadb.env" env_file: "${INSTALL_DIR}/env/mariadb.env"
command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci'] command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
ports: ports:
- "127.0.0.1:3306:3306/tcp" - "127.0.0.1:3306:3306/tcp"
healthcheck: healthcheck:
test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval} test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
start_period: 5s start_period: 5s
interval: 5s interval: 5s
timeout: 5s timeout: 5s