Skip to content
Snippets Groups Projects
Commit 6b635044 authored by Thomas Müller's avatar Thomas Müller
Browse files

Use official mariadb docker

parent ca2755ed
No related branches found
No related tags found
No related merge requests found
...@@ -185,11 +185,12 @@ function execute_tests { ...@@ -185,11 +185,12 @@ function execute_tests {
if [ ! -z "$USEDOCKER" ] ; then if [ ! -z "$USEDOCKER" ] ; then
echo "Fire up the mariadb docker" echo "Fire up the mariadb docker"
DOCKER_CONTAINER_ID=$(docker run \ DOCKER_CONTAINER_ID=$(docker run \
-v $BASEDIR/tests/docker/mariadb:/etc/mysql/conf.d \
-e MYSQL_ROOT_PASSWORD=owncloud \ -e MYSQL_ROOT_PASSWORD=owncloud \
-e MYSQL_USER="$DATABASEUSER" \ -e MYSQL_USER="$DATABASEUSER" \
-e MYSQL_PASSWORD=owncloud \ -e MYSQL_PASSWORD=owncloud \
-e MYSQL_DATABASE="$DATABASENAME" \ -e MYSQL_DATABASE="$DATABASENAME" \
-d rullzer/mariadb-owncloud) -d mariadb)
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
echo "Waiting for MariaDB initialisation ..." echo "Waiting for MariaDB initialisation ..."
......
[mysqld]
innodb_buffer_pool_size = 512M
innodb_flush_log_at_trx_commit = 2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment