Docker: Improve mariadb init

Signed-off-by: Kevin Morris <kevr@0cost.org>

docker/scripts/run-mariadb.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-mysqld_safe --datadir=/var/lib/mysql --skip-networking &
-until mysqladmin ping --silent; do
-    sleep 1s
-done
-
-# Create test database.
-mysql -u root -e "CREATE USER 'aur'@'%' IDENTIFIED BY 'aur'" \
-    2>/dev/null || /bin/true
-
-# Create a brand new 'aurweb_test' DB.
-mysql -u root -e "DROP DATABASE aurweb_test" 2>/dev/null || /bin/true
-mysql -u root -e "CREATE DATABASE aurweb_test"
-mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb_test.* TO 'aur'@'%'"
-
-# Create the 'aurweb' DB if it does not yet exist.
-mysql -u root -e "CREATE DATABASE aurweb" 2>/dev/null || /bin/true
-mysql -u root -e "GRANT ALL PRIVILEGES ON aurweb.* TO 'aur'@'%'"
-
-mysql -u root -e "FLUSH PRIVILEGES"
-
-# Shutdown mariadb.
-mysqladmin -uroot shutdown
-
-exec "$@"

docker/scripts/run-pytests.sh

@@ -23,7 +23,8 @@ while [ $# -ne 0 ]; do
 done
 
 # Initialize the new database; ignore errors.
-python -m aurweb.initdb 2>/dev/null || /bin/true
+python -m aurweb.initdb 2>/dev/null || \
+    (echo "Error: aurweb.initdb failed; already initialized?" && /bin/true)
 
 # Run pytest with optional targets in front of it.
 make -C test "${PARAMS[@]}" pytest