From adda3e6f252e71becf85138a1283808d75d2a55d Mon Sep 17 00:00:00 2001 From: Donkie Date: Sun, 21 May 2023 23:46:44 +0200 Subject: [PATCH] Less yank mariadb healthcheck --- tests_integration/docker-compose-mariadb.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests_integration/docker-compose-mariadb.yml b/tests_integration/docker-compose-mariadb.yml index 4fbeb81..66afe87 100644 --- a/tests_integration/docker-compose-mariadb.yml +++ b/tests_integration/docker-compose-mariadb.yml @@ -7,11 +7,19 @@ services: - MARIADB_RANDOM_ROOT_PASSWORD=yes - MARIADB_PASSWORD=abc - MARIADB_DATABASE=spoolman + - MARIADB_MYSQL_LOCALHOST_USER=true healthcheck: - test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ] + test: + [ + "CMD", + "/usr/local/bin/healthcheck.sh", + "--su-mysql", + "--connect", + "--innodb_initialized" + ] interval: 1s - timeout: 20s - retries: 10 + timeout: 5s + retries: 30 spoolman: image: donkie/spoolman:test environment: