Browse Source

Use official mariadb docker

Thomas Müller 8 years ago
parent
commit
6b635044a7
2 changed files with 7 additions and 1 deletions
  1. 2 1
      autotest.sh
  2. 5 0
      tests/docker/mariadb/oc.cnf

+ 2 - 1
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 ..."

+ 5 - 0
tests/docker/mariadb/oc.cnf

@@ -0,0 +1,5 @@
+
+[mysqld]
+
+innodb_buffer_pool_size = 512M
+innodb_flush_log_at_trx_commit = 2