update env
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Philipp Lang 2022-11-24 12:33:46 +01:00
parent bf69f80ece
commit c43c0ece42
6 changed files with 46 additions and 99 deletions

View File

@ -44,27 +44,55 @@ steps:
- chmod 600 $HOME/.ssh/id_rsa - chmod 600 $HOME/.ssh/id_rsa
- git submodule update --init --recursive - git submodule update --init --recursive
- name: composer - name: composer_dev
image: composer:2.2.7 image: composer:2.2.7
commands: commands:
- composer install --ignore-platform-reqs --no-dev - composer install --ignore-platform-reqs --dev
- name: mysql_healthcheck - name: mysql_healthcheck
image: mariadb/server:10.3 image: mariadb/server:10.3
commands: commands:
- while ! mysqladmin ping -h db -u db -pdb --silent; do sleep 1; done - while ! mysqladmin ping -h db -u db -pdb --silent; do sleep 1; done
- name: migrate
image: php:8.1.6
commands:
- cp .env.testing .env
- php artisan key:generate
- php artisan migrate --database=mysqltest
- name: phpunit_tests - name: phpunit_tests
image: php:8.1.6 image: php:8.1.6
volumes:
- name: texlive
path: /usr/local/texlive
commands: commands:
- apt-get update && apt-get install -y libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev texlive
- docker-php-ext-install pdo_mysql curl gd intl mbstring
- echo "" > .env
- php artisan key:generate
- php artisan migrate
- vendor/bin/phpunit - vendor/bin/phpunit
- rm -f .env
environment:
APP_NAME: Scoutrobot
APP_ENV: local
APP_DEBUG: true
APP_URL: http://scoutrobot.test
APP_MODE: stamm
LOG_CHANNEL: stack
DB_CONNECTION: mysql
DB_HOST: db
DB_PORT: 3306
DB_DATABASE: db
DB_USERNAME: db
DB_PASSWORD: db
BROADCAST_DRIVER: log
CACHE_DRIVER: file
QUEUE_CONNECTION: sync
SESSION_DRIVER: file
SESSION_LIFETIME: 120
MAIL_FROM_NAME: '${APP_NAME}'
PDFLATEX_BIN: /usr/local/texlive/bin/x86_64-linux/pdflatex
XELATEX_BIN: /usr/local/texlive/bin/x86_64-linux/xelatex
- name: composer_no_dev
image: composer:2.2.7
commands:
- composer install --ignore-platform-reqs --no-dev
- name: phpstan_tests - name: phpstan_tests
image: php:8.1.6 image: php:8.1.6
@ -133,11 +161,16 @@ services:
- name: db - name: db
image: mariadb/server:10.3 image: mariadb/server:10.3
environment: environment:
MARIADB_DATABASE: db MARIADB_DATABASE: dbtest
MARIADB_USER: db MARIADB_USER: db
MARIADB_PASSWORD: db MARIADB_PASSWORD: db
MARIADB_ALLOW_EMPTY_PASSWORD: yes MARIADB_ALLOW_EMPTY_PASSWORD: yes
volumes:
- name: texlive
host:
path: /usr/local/texlive
trigger: trigger:
event: event:
- push - push

View File

@ -11,7 +11,6 @@ DB_CONNECTION=mysql
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3306 DB_PORT=3306
DB_DATABASE=laravel DB_DATABASE=laravel
DB_TEST_DATABASE=laraveltest
DB_USERNAME=root DB_USERNAME=root
DB_PASSWORD= DB_PASSWORD=
@ -39,17 +38,13 @@ AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1 AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET= AWS_BUCKET=
XELATEX= XELATEX_BIN=
PDFLATEX= PDFLATEX_BIN=
PUSHER_APP_ID= PUSHER_APP_ID=
PUSHER_APP_KEY= PUSHER_APP_KEY=
PUSHER_APP_SECRET= PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1 PUSHER_APP_CLUSTER=mt1
NAMI_MGLNR=-1
NAMI_GROUP=-1
NAMI_PASSWORD=password
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

View File

@ -1,55 +0,0 @@
APP_NAME=Scoutrobot
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_MODE=
LOG_CHANNEL=stack
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=laravel
DB_TEST_DATABASE=laraveltest
DB_USERNAME=root
DB_PASSWORD=
BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_MAILER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME="${APP_NAME}"
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
XELATEX=
PDFLATEX=
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1
NAMI_MGLNR=-1
NAMI_GROUP=-1
NAMI_PASSWORD=password
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

1
.gitignore vendored
View File

@ -9,6 +9,7 @@
/vendor /vendor
.env .env
.env.backup .env.backup
.env.testing
.phpunit.result.cache .phpunit.result.cache
Homestead.json Homestead.json
Homestead.yaml Homestead.yaml

View File

@ -3,7 +3,6 @@
use Illuminate\Support\Str; use Illuminate\Support\Str;
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Default Database Connection Name | Default Database Connection Name
@ -34,7 +33,6 @@ return [
*/ */
'connections' => [ 'connections' => [
'sqlite' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'url' => env('DATABASE_URL'), 'url' => env('DATABASE_URL'),
@ -63,26 +61,6 @@ return [
]) : [], ]) : [],
], ],
'mysqltest' => [
'driver' => 'mysql',
'url' => env('DATABASE_URL'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge').'test',
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
],
'pgsql' => [ 'pgsql' => [
'driver' => 'pgsql', 'driver' => 'pgsql',
'url' => env('DATABASE_URL'), 'url' => env('DATABASE_URL'),
@ -110,7 +88,6 @@ return [
'prefix' => '', 'prefix' => '',
'prefix_indexes' => true, 'prefix_indexes' => true,
], ],
], ],
/* /*
@ -138,7 +115,6 @@ return [
*/ */
'redis' => [ 'redis' => [
'client' => env('REDIS_CLIENT', 'phpredis'), 'client' => env('REDIS_CLIENT', 'phpredis'),
'options' => [ 'options' => [
@ -161,7 +137,5 @@ return [
'port' => env('REDIS_PORT', '6379'), 'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_CACHE_DB', '1'), 'database' => env('REDIS_CACHE_DB', '1'),
], ],
], ],
]; ];

View File

@ -23,7 +23,6 @@
<server name="APP_ENV" value="testing"/> <server name="APP_ENV" value="testing"/>
<server name="BCRYPT_ROUNDS" value="4"/> <server name="BCRYPT_ROUNDS" value="4"/>
<server name="CACHE_DRIVER" value="array"/> <server name="CACHE_DRIVER" value="array"/>
<server name="DB_CONNECTION" value="mysqltest"/>
<server name="MAIL_MAILER" value="array"/> <server name="MAIL_MAILER" value="array"/>
<server name="QUEUE_CONNECTION" value="sync"/> <server name="QUEUE_CONNECTION" value="sync"/>
<server name="SESSION_DRIVER" value="array"/> <server name="SESSION_DRIVER" value="array"/>