DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2019-02-13 22:04:58 -08:00
parent b5aadd4b74 9183de578d
commit d24851c5d8
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/entrypoint.sh
View file

@ -47,5 +47,9 @@ then
cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/ cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
fi fi
php artisan migrate --force
php artisan config:clear
php artisan config:cache
. /etc/apache2/envvars . /etc/apache2/envvars
exec apache2 -DNO_DETACH < /dev/null exec apache2 -DNO_DETACH < /dev/null

5
docker/entrypoint_alpine.sh
View file

@ -44,5 +44,10 @@ if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]
then then
cp -a /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/ cp -a /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
fi fi
php artisan migrate --force
php artisan config:clear
php artisan config:cache
export APACHE_LOG_DIR=/var/log/apache2 export APACHE_LOG_DIR=/var/log/apache2
exec httpd -DNO_DETACH < /dev/null exec httpd -DNO_DETACH < /dev/null