diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-11 16:11:41 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-11 16:17:17 +0300 |
| commit | 6b635044a721c5ccf63a6e20165ed7d775fafaa2 (patch) | |
| tree | c6f7af1db8264022a5d8fea3a3ff5906a0b1626a /autotest.sh | |
| parent | ca2755ed6af0279b203da12e09bc4094af3aa49b (diff) | |
Use official mariadb docker
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 3 |
1 files changed, 2 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 ..." |