Merge pull request #22314 from owncloud/fix-mariadb-autotest
Wait until mariadb is up and running
This commit is contained in:
commit
fe9215adf6
10
autotest.sh
10
autotest.sh
|
@ -185,17 +185,19 @@ function execute_tests {
|
|||
if [ ! -z "$USEDOCKER" ] ; then
|
||||
echo "Fire up the mariadb docker"
|
||||
DOCKER_CONTAINER_ID=$(docker run \
|
||||
-v $BASEDIR/tests/docker/mariadb:/etc/mysql/conf.d \
|
||||
-e MYSQL_ROOT_PASSWORD=owncloud \
|
||||
-e MYSQL_USER="$DATABASEUSER" \
|
||||
-e MYSQL_PASSWORD=owncloud \
|
||||
-e MYSQL_DATABASE="$DATABASENAME" \
|
||||
-d rullzer/mariadb-owncloud)
|
||||
-d mariadb)
|
||||
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
||||
|
||||
echo "Waiting for MariaDB initialisation ..."
|
||||
|
||||
# grep exits on the first match and then the script continues
|
||||
timeout 30 docker logs -f $DOCKER_CONTAINER_ID 2>&1 | grep -q "mysqld: ready for connections."
|
||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 60; then
|
||||
echo "[ERROR] Waited 60 seconds, no response" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "MariaDB is up."
|
||||
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
[mysqld]
|
||||
|
||||
innodb_buffer_pool_size = 512M
|
||||
innodb_flush_log_at_trx_commit = 2
|
Loading…
Reference in New Issue