iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed tests database to mariadb

This commit is contained in:
Igor Scheller 2017-11-25 10:53:50 +01:00
parent 25e434bce4
commit b9bc03a1bd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -5,12 +5,13 @@ cache:
- .composer - .composer
services: services:
- mysql:5.6 - mariadb:10.2
variables: variables:
MYSQL_DATABASE: engelsystem MYSQL_DATABASE: engelsystem
MYSQL_USER: engel MYSQL_USER: engel
MYSQL_PASSWORD: engelsystem MYSQL_PASSWORD: engelsystem
MYSQL_HOST: mariadb
COMPOSER_HOME: .composer COMPOSER_HOME: .composer
MYSQL_RANDOM_ROOT_PASSWORD: "yes" MYSQL_RANDOM_ROOT_PASSWORD: "yes"
@ -20,14 +21,14 @@ before_script:
- find . -type d -exec chmod 755 {} \; - find . -type d -exec chmod 755 {} \;
# Install required Packages # Install required Packages
- apt update -yqq - apt update -yqq
- apt install -yqq git unzip mysql-client - apt install -yqq git unzip mariadb-client
- docker-php-ext-install pdo pdo_mysql gettext - docker-php-ext-install pdo pdo_mysql gettext
# Install xdebug # Install xdebug
- pecl install xdebug - pecl install xdebug
- docker-php-ext-enable xdebug - docker-php-ext-enable xdebug
# MySQL DB # MySQL DB
- mysql -h mysql -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" < db/install.sql - mysql -h "$MYSQL_HOST" -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" < db/install.sql
- mysql -h mysql -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" < db/update.sql - mysql -h "$MYSQL_HOST" -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" < db/update.sql
# Install Composer # Install Composer
- curl -sS https://getcomposer.org/installer | php -- --no-ansi --install-dir /usr/local/bin/ --filename composer - curl -sS https://getcomposer.org/installer | php -- --no-ansi --install-dir /usr/local/bin/ --filename composer
- /usr/local/bin/composer --no-ansi install - /usr/local/bin/composer --no-ansi install

2
config/config.default.php
View File

@ -5,7 +5,7 @@
return [ return [
// MySQL-Connection Settings // MySQL-Connection Settings
'database' => [ 'database' => [
'host' => env('MYSQL_HOST', (env('CI', false) ? 'mysql' : 'localhost')), 'host' => env('MYSQL_HOST', (env('CI', false) ? 'mariadb' : 'localhost')),
'user' => env('MYSQL_USER', 'root'), 'user' => env('MYSQL_USER', 'root'),
'pw' => env('MYSQL_PASSWORD', ''), 'pw' => env('MYSQL_PASSWORD', ''),
'db' => env('MYSQL_DATABASE', 'engelsystem'), 'db' => env('MYSQL_DATABASE', 'engelsystem'),