From 2cdebe57afa2fed5153a3f782a5cfd6053a83f49 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 2 Dec 2020 16:25:42 +0100 Subject: [PATCH] [ticket/16659] Use volume for /var/run/mysqld PHPBB3-16659 --- .github/workflows/tests.yml | 1 + travis/setup-phpbb.sh | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 39b04bb9fd..46cd9cb718 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -66,6 +66,7 @@ jobs: ports: - 3306:3306 options: >- + -v /srv/docker/sockets/mariadb:/var/run/mysqld --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index a6e51b5ed9..9bf19242ca 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -22,6 +22,15 @@ then travis/setup-unbuffer.sh fi +if [ "$DB" == "mariadb" ] +then + ls -l /var/run | grep -i mysqld + + if [ ! -f "/var/run/mysqld/mysqld.sock" ]; then + ln -s /srv/docker/sockets/mariadb/mysqld.sock /var/run/mysqld/mysqld.sock + fi +fi + if [ "$MYSQL8" == '1' ] then travis/setup-mysql8.sh