diff --git a/docker/scripts/db/mysql.sh b/docker/scripts/db/mysql.sh index 24ca7e4107..8fd0390564 100644 --- a/docker/scripts/db/mysql.sh +++ b/docker/scripts/db/mysql.sh @@ -29,4 +29,6 @@ EOL mysql docker run --rm --link mysql:mysql waisbrot/wait + + echo 'Mysql UP' } diff --git a/docker/scripts/jobs/unit-tests.sh b/docker/scripts/jobs/unit-tests.sh index 728de53143..67dda17bbd 100755 --- a/docker/scripts/jobs/unit-tests.sh +++ b/docker/scripts/jobs/unit-tests.sh @@ -9,6 +9,21 @@ php=$2 start_db +echo docker run \ + --user $(id -u):$(id -g) \ + ${DOCKER_LINK} \ + --env PHPBB_TEST_DBMS="${PHPBB_TEST_DBMS}" \ + --env PHPBB_TEST_DBHOST="${PHPBB_TEST_DBHOST}" \ + --env PHPBB_TEST_DBPORT="${PHPBB_TEST_DBPORT}" \ + --env PHPBB_TEST_DBNAME="${PHPBB_TEST_DBNAME}" \ + --env PHPBB_TEST_DBUSER="${PHPBB_TEST_DBUSER}" \ + --env PHPBB_TEST_DBPASSWD="${PHPBB_TEST_DBPASSWD}" \ + --env PHPBB_TEST_TABLE_PREFIX="${PHPBB_TEST_TABLE_PREFIX}" \ + --volume ${WORKING_DIR}:/data \ + --workdir /data \ + phpbb/php-ut-${php}-${db} php -d memory_limit=-1 phpBB/vendor/bin/phpunit --group __nogroup__ --log-junit build/logs/phpunit.xml + + docker run \ --user $(id -u):$(id -g) \ ${DOCKER_LINK} \