diff options
| -rwxr-xr-x | autotest.sh | 3 | ||||
| -rw-r--r-- | tests/docker/mariadb/oc.cnf | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/autotest.sh b/autotest.sh index f4c70f99b8a..48b73283499 100755 --- a/autotest.sh +++ b/autotest.sh @@ -185,11 +185,12 @@ 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 ..." diff --git a/tests/docker/mariadb/oc.cnf b/tests/docker/mariadb/oc.cnf new file mode 100644 index 00000000000..590284d4617 --- /dev/null +++ b/tests/docker/mariadb/oc.cnf @@ -0,0 +1,5 @@ + +[mysqld] + +innodb_buffer_pool_size = 512M +innodb_flush_log_at_trx_commit = 2 |