IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update scripts.

Browse Source
This commit is contained in:
James Cole 2019-04-06 11:09:14 +02:00
parent 47fdf4b1a2
commit bc735e3a59
3 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.deploy/docker/entrypoint.sh
View File

@ -27,12 +27,6 @@ then
echo "Touched!"
fi
if [[ $FF_DB_CONNECTION == "sqlite" ]]
then
touch $FIREFLY_PATH/storage/database/database.sqlite
echo "Touched!"
fi
# make sure we own the volumes:
echo "Run chown on ${FIREFLY_PATH}/storage..."
chown -R www-data:www-data -R $FIREFLY_PATH/storage
@ -43,8 +37,8 @@ chmod -R 775 $FIREFLY_PATH/storage
echo "Remove log file..."
rm -f $FIREFLY_PATH/storage/logs/laravel.log
echo "Map environment variables on .env file..."
cat $FIREFLY_PATH/.deploy/docker/.env.docker | envsubst > $FIREFLY_PATH/.env
#echo "Map environment variables on .env file..."
#cat $FIREFLY_PATH/.deploy/docker/.env.docker | envsubst > $FIREFLY_PATH/.env
echo "Dump auto load..."
composer dump-autoload
echo "Discover packages..."
@ -92,6 +86,8 @@ php artisan firefly-iii:delete-orphaned-transactions
php artisan firefly-iii:delete-empty-journals
php artisan firefly-iii:delete-empty-groups
php artisan firefly-iii:fix-account-types
php artisan firefly-iii:fix-account-types
php artisan firefly-iii:rename-meta-fields
# report commands
php artisan firefly-iii:report-empty-objects

1
composer.json
View File

@ -157,6 +157,7 @@
"@php artisan firefly-iii:delete-empty-journals",
"@php artisan firefly-iii:delete-empty-groups",
"@php artisan firefly-iii:fix-account-types",
"@php artisan firefly-iii:rename-meta-fields",
"@php artisan firefly-iii:report-empty-objects",
"@php artisan firefly-iii:report-sum",

115
composer.lock generated
View File

@ -873,25 +873,30 @@
},
{
"name": "dragonmantank/cron-expression",
"version": "v2.2.0",
"version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
"reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5"
"reference": "72b6fbf76adb3cf5bc0db68559b33d41219aba27"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5",
"reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5",
"url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/72b6fbf76adb3cf5bc0db68559b33d41219aba27",
"reference": "72b6fbf76adb3cf5bc0db68559b33d41219aba27",
"shasum": ""
},
"require": {
"php": ">=7.0.0"
"php": "^7.0"
},
"require-dev": {
"phpunit/phpunit": "~6.4"
"phpunit/phpunit": "^6.4|^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
}
},
"autoload": {
"psr-4": {
"Cron\\": "src/Cron/"
@ -918,7 +923,7 @@
"cron",
"schedule"
],
"time": "2018-06-06T03:12:17+00:00"
"time": "2019-03-31T00:38:28+00:00"
},
{
"name": "egulias/email-validator",
@ -1308,16 +1313,16 @@
},
{
"name": "laravel/framework",
"version": "v5.8.7",
"version": "v5.8.9",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "f12c7baf9ceee80b131e06a01d3221d9a2488670"
"reference": "2455d21938e9072e5a8ecef64ae162a1825d336b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/f12c7baf9ceee80b131e06a01d3221d9a2488670",
"reference": "f12c7baf9ceee80b131e06a01d3221d9a2488670",
"url": "https://api.github.com/repos/laravel/framework/zipball/2455d21938e9072e5a8ecef64ae162a1825d336b",
"reference": "2455d21938e9072e5a8ecef64ae162a1825d336b",
"shasum": ""
},
"require": {
@ -1451,7 +1456,7 @@
"framework",
"laravel"
],
"time": "2019-03-21T16:54:38+00:00"
"time": "2019-04-02T14:11:17+00:00"
},
{
"name": "laravel/passport",
@ -1651,16 +1656,16 @@
},
{
"name": "league/commonmark",
"version": "0.18.4",
"version": "0.18.5",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "93fa5e85c2e5e7f59ee2537449abc677096fb1c8"
"reference": "f94e18d68260f43a7d846279cad88405854b1306"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/93fa5e85c2e5e7f59ee2537449abc677096fb1c8",
"reference": "93fa5e85c2e5e7f59ee2537449abc677096fb1c8",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/f94e18d68260f43a7d846279cad88405854b1306",
"reference": "f94e18d68260f43a7d846279cad88405854b1306",
"shasum": ""
},
"require": {
@ -1716,7 +1721,7 @@
"markdown",
"parser"
],
"time": "2019-03-24T02:45:32+00:00"
"time": "2019-03-28T13:52:31+00:00"
},
{
"name": "league/csv",
@ -1837,16 +1842,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.50",
"version": "1.0.51",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "dab4e7624efa543a943be978008f439c333f2249"
"reference": "755ba7bf3fb9031e6581d091db84d78275874396"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dab4e7624efa543a943be978008f439c333f2249",
"reference": "dab4e7624efa543a943be978008f439c333f2249",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/755ba7bf3fb9031e6581d091db84d78275874396",
"reference": "755ba7bf3fb9031e6581d091db84d78275874396",
"shasum": ""
},
"require": {
@ -1917,7 +1922,7 @@
"sftp",
"storage"
],
"time": "2019-02-01T08:50:36+00:00"
"time": "2019-03-30T13:22:34+00:00"
},
{
"name": "league/flysystem-replicate-adapter",
@ -2073,16 +2078,16 @@
},
{
"name": "league/oauth2-server",
"version": "7.3.2",
"version": "7.3.3",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth2-server.git",
"reference": "b71f382cd76e3f6905dfc53ef8148b3eebe1fd41"
"reference": "c7f499849704ebe2c60b45b6d6bb231df5601d4a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/b71f382cd76e3f6905dfc53ef8148b3eebe1fd41",
"reference": "b71f382cd76e3f6905dfc53ef8148b3eebe1fd41",
"url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/c7f499849704ebe2c60b45b6d6bb231df5601d4a",
"reference": "c7f499849704ebe2c60b45b6d6bb231df5601d4a",
"shasum": ""
},
"require": {
@ -2146,7 +2151,7 @@
"secure",
"server"
],
"time": "2018-11-21T21:42:43+00:00"
"time": "2019-03-29T18:19:35+00:00"
},
{
"name": "litipk/flysystem-fallback-adapter",
@ -2304,16 +2309,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.16.1",
"version": "2.16.2",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "b509524136d579f6b15ad9af4e5bd4533d1ab6c2"
"reference": "720a9c36927396efeeb48a972e9d129d44b6dc28"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/b509524136d579f6b15ad9af4e5bd4533d1ab6c2",
"reference": "b509524136d579f6b15ad9af4e5bd4533d1ab6c2",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/720a9c36927396efeeb48a972e9d129d44b6dc28",
"reference": "720a9c36927396efeeb48a972e9d129d44b6dc28",
"shasum": ""
},
"require": {
@ -2360,7 +2365,7 @@
"datetime",
"time"
],
"time": "2019-03-20T12:20:01+00:00"
"time": "2019-03-29T12:23:12+00:00"
},
{
"name": "opis/closure",
@ -4549,7 +4554,7 @@
},
{
"name": "tightenco/collect",
"version": "v5.8.7",
"version": "v5.8.8",
"source": {
"type": "git",
"url": "https://github.com/tightenco/collect.git",
@ -4832,16 +4837,16 @@
"packages-dev": [
{
"name": "barryvdh/laravel-ide-helper",
"version": "v2.6.1",
"version": "v2.6.2",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
"reference": "725711022be71c6fa2e7bc8f9648bf125986f027"
"reference": "39c148ad4273f5b8c49d0a363ddbc0462f1f2eec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/725711022be71c6fa2e7bc8f9648bf125986f027",
"reference": "725711022be71c6fa2e7bc8f9648bf125986f027",
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/39c148ad4273f5b8c49d0a363ddbc0462f1f2eec",
"reference": "39c148ad4273f5b8c49d0a363ddbc0462f1f2eec",
"shasum": ""
},
"require": {
@ -4902,7 +4907,7 @@
"phpstorm",
"sublime"
],
"time": "2019-03-05T09:24:51+00:00"
"time": "2019-03-26T10:38:22+00:00"
},
{
"name": "barryvdh/reflection-docblock",
@ -5153,24 +5158,23 @@
},
{
"name": "composer/spdx-licenses",
"version": "1.5.0",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
"reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2"
"reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
"reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
"reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
"php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
"phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
"phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
},
"type": "library",
"extra": {
@ -5210,7 +5214,7 @@
"spdx",
"validator"
],
"time": "2018-11-01T09:45:54+00:00"
"time": "2019-03-26T10:23:26+00:00"
},
{
"name": "composer/xdebug-handler",
@ -6269,16 +6273,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.0.5",
"version": "8.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "19cbed2120839772c4a00e8b28456b0c77d1a7b4"
"reference": "925109f8bbe6dae28fbc7bb07446a53abd3b1c25"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/19cbed2120839772c4a00e8b28456b0c77d1a7b4",
"reference": "19cbed2120839772c4a00e8b28456b0c77d1a7b4",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/925109f8bbe6dae28fbc7bb07446a53abd3b1c25",
"reference": "925109f8bbe6dae28fbc7bb07446a53abd3b1c25",
"shasum": ""
},
"require": {
@ -6347,7 +6351,7 @@
"testing",
"xunit"
],
"time": "2019-03-16T07:33:46+00:00"
"time": "2019-03-26T14:00:24+00:00"
},
{
"name": "roave/security-advisories",
@ -6355,12 +6359,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "018ec51b676a4d1efc971950d1d9619570b71676"
"reference": "0698207bf8a9bed212fdde2d8c7cdc77085660c4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/018ec51b676a4d1efc971950d1d9619570b71676",
"reference": "018ec51b676a4d1efc971950d1d9619570b71676",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0698207bf8a9bed212fdde2d8c7cdc77085660c4",
"reference": "0698207bf8a9bed212fdde2d8c7cdc77085660c4",
"shasum": ""
},
"conflict": {
@ -6517,6 +6521,7 @@
"zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2",
"zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2",
"zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5",
"zendframework/zend-developer-tools": ">=1.2.2,<1.2.3",
"zendframework/zend-diactoros": ">=1,<1.8.4",
"zendframework/zend-feed": ">=1,<2.10.3",
"zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1",
@ -6551,7 +6556,7 @@
}
],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2019-03-22T05:18:50+00:00"
"time": "2019-03-28T22:30:08+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",