From 37f502d6dd676a3d17f7bddba644055cd693fbcf Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Sun, 13 Oct 2024 17:25:22 +0200 Subject: [PATCH] 2.x docker --- .github/workflows/docker-2x.yml | 1 - app/Models/User.php | 7 +- composer.json | 6 +- composer.lock | 253 ++++++++++++++++---------------- docker/Dockerfile | 14 +- docker/docker-compose.yml | 21 +++ 6 files changed, 166 insertions(+), 136 deletions(-) create mode 100644 docker/docker-compose.yml diff --git a/.github/workflows/docker-2x.yml b/.github/workflows/docker-2x.yml index 80dcc7cc..ca21a59a 100644 --- a/.github/workflows/docker-2x.yml +++ b/.github/workflows/docker-2x.yml @@ -29,7 +29,6 @@ jobs: docker buildx build . \ -f docker/Dockerfile \ -t vitodeploy/vito:2.x \ - --build-arg="RELEASE=0" \ --platform linux/amd64,linux/arm64 \ --no-cache \ --push diff --git a/app/Models/User.php b/app/Models/User.php index 4e6aa838..9f91c768 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -72,8 +72,13 @@ public static function boot(): void parent::boot(); static::created(function (User $user) { - if (Project::count() === 0) { + if ($user->projects()->count() === 0) { $user->createDefaultProject(); + $user->refresh(); + } + if (! $user->currentProject) { + $user->current_project_id = $user->projects()->first()->id; + $user->save(); } }); } diff --git a/composer.json b/composer.json index 1f1faacb..5a51a759 100644 --- a/composer.json +++ b/composer.json @@ -2,11 +2,15 @@ "name": "vitodeploy/vito", "type": "project", "description": "The ultimate server management tool", - "keywords": ["framework", "laravel"], + "keywords": [ + "framework", + "laravel" + ], "license": "AGPL-3.0", "require": { "php": "^8.2", "ext-ftp": "*", + "ext-intl": "*", "aws/aws-sdk-php": "^3.158", "filament/filament": "^3.2", "laravel/fortify": "^1.17", diff --git a/composer.lock b/composer.lock index 6705c29c..9cc52df7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "616d8813a66d4a67234d11ebe6f90d67", + "content-hash": "cd410bf2bc1c93170c1426bcdf231181", "packages": [ { "name": "anourvalar/eloquent-serialize", @@ -128,16 +128,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.322.8", + "version": "3.324.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "fb5099160e49b676277ae787ff721628e5e4dd5a" + "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fb5099160e49b676277ae787ff721628e5e4dd5a", - "reference": "fb5099160e49b676277ae787ff721628e5e4dd5a", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b824a9b8015a38f18c53b023975c0f63c7bd3dc", + "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc", "shasum": "" }, "require": { @@ -220,9 +220,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.322.8" + "source": "https://github.com/aws/aws-sdk-php/tree/3.324.1" }, - "time": "2024-09-30T19:09:25+00:00" + "time": "2024-10-11T18:22:01+00:00" }, { "name": "bacon/bacon-qr-code", @@ -789,16 +789,16 @@ }, { "name": "doctrine/dbal", - "version": "4.1.1", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8" + "reference": "dadd35300837a3a2184bd47d403333b15d0a9bd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/7a8252418689feb860ea8dfeab66d64a56a64df8", - "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/dadd35300837a3a2184bd47d403333b15d0a9bd0", + "reference": "dadd35300837a3a2184bd47d403333b15d0a9bd0", "shasum": "" }, "require": { @@ -811,7 +811,7 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.2", - "phpstan/phpstan": "1.12.0", + "phpstan/phpstan": "1.12.6", "phpstan/phpstan-phpunit": "1.4.0", "phpstan/phpstan-strict-rules": "^1.6", "phpunit/phpunit": "10.5.30", @@ -877,7 +877,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/4.1.1" + "source": "https://github.com/doctrine/dbal/tree/4.2.1" }, "funding": [ { @@ -893,7 +893,7 @@ "type": "tidelift" } ], - "time": "2024-09-03T08:58:39+00:00" + "time": "2024-10-10T18:01:27+00:00" }, { "name": "doctrine/deprecations", @@ -1112,16 +1112,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.3", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" + "reference": "8c784d071debd117328803d86b2097615b457500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500", + "reference": "8c784d071debd117328803d86b2097615b457500", "shasum": "" }, "require": { @@ -1134,10 +1134,14 @@ "require-dev": { "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", - "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^7.0|^8.0|^9.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, "autoload": { "psr-4": { "Cron\\": "src/Cron/" @@ -1161,7 +1165,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0" }, "funding": [ { @@ -1169,7 +1173,7 @@ "type": "github" } ], - "time": "2023-08-10T19:36:49+00:00" + "time": "2024-10-09T13:47:03+00:00" }, { "name": "egulias/email-validator", @@ -1240,16 +1244,16 @@ }, { "name": "filament/actions", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/actions.git", - "reference": "38c6eb00c7e3265907b37482c2dfd411c6f910c9" + "reference": "886108b59ce99edc26f5bc1231134a95ec58718a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/actions/zipball/38c6eb00c7e3265907b37482c2dfd411c6f910c9", - "reference": "38c6eb00c7e3265907b37482c2dfd411c6f910c9", + "url": "https://api.github.com/repos/filamentphp/actions/zipball/886108b59ce99edc26f5bc1231134a95ec58718a", + "reference": "886108b59ce99edc26f5bc1231134a95ec58718a", "shasum": "" }, "require": { @@ -1289,20 +1293,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-27T13:16:08+00:00" + "time": "2024-10-09T11:19:22+00:00" }, { "name": "filament/filament", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/panels.git", - "reference": "8d0f0e7101c14fe2f00490172452767f16b39f02" + "reference": "84f839b4b42549c0d4bd231648da17561ada70c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/panels/zipball/8d0f0e7101c14fe2f00490172452767f16b39f02", - "reference": "8d0f0e7101c14fe2f00490172452767f16b39f02", + "url": "https://api.github.com/repos/filamentphp/panels/zipball/84f839b4b42549c0d4bd231648da17561ada70c2", + "reference": "84f839b4b42549c0d4bd231648da17561ada70c2", "shasum": "" }, "require": { @@ -1354,20 +1358,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-27T13:16:11+00:00" + "time": "2024-10-08T14:24:12+00:00" }, { "name": "filament/forms", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/forms.git", - "reference": "ffa33043ea0ee67a4eed58535687f87311e4256b" + "reference": "896c868cca474b2e925a3e6162b7c76d8ff3e5fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/forms/zipball/ffa33043ea0ee67a4eed58535687f87311e4256b", - "reference": "ffa33043ea0ee67a4eed58535687f87311e4256b", + "url": "https://api.github.com/repos/filamentphp/forms/zipball/896c868cca474b2e925a3e6162b7c76d8ff3e5fc", + "reference": "896c868cca474b2e925a3e6162b7c76d8ff3e5fc", "shasum": "" }, "require": { @@ -1410,20 +1414,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-27T13:16:04+00:00" + "time": "2024-10-09T11:19:26+00:00" }, { "name": "filament/infolists", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/infolists.git", - "reference": "d4d3030644e3617aed252a5df3c385145ada0ec6" + "reference": "fc5f01c094fe25ef906f3e1b88d3d8883a73d6be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/infolists/zipball/d4d3030644e3617aed252a5df3c385145ada0ec6", - "reference": "d4d3030644e3617aed252a5df3c385145ada0ec6", + "url": "https://api.github.com/repos/filamentphp/infolists/zipball/fc5f01c094fe25ef906f3e1b88d3d8883a73d6be", + "reference": "fc5f01c094fe25ef906f3e1b88d3d8883a73d6be", "shasum": "" }, "require": { @@ -1461,20 +1465,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-27T13:16:10+00:00" + "time": "2024-10-08T14:24:09+00:00" }, { "name": "filament/notifications", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/notifications.git", - "reference": "0272612e1d54e0520f8717b24c71b9b70f198c8f" + "reference": "a5f684b690354630210fc9a90bd06da9b1f6ae82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/notifications/zipball/0272612e1d54e0520f8717b24c71b9b70f198c8f", - "reference": "0272612e1d54e0520f8717b24c71b9b70f198c8f", + "url": "https://api.github.com/repos/filamentphp/notifications/zipball/a5f684b690354630210fc9a90bd06da9b1f6ae82", + "reference": "a5f684b690354630210fc9a90bd06da9b1f6ae82", "shasum": "" }, "require": { @@ -1513,20 +1517,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-27T13:16:07+00:00" + "time": "2024-10-08T14:24:11+00:00" }, { "name": "filament/support", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/support.git", - "reference": "6dba51efd6f2a32db21bc8684cd663915ab0e4d7" + "reference": "31fcff80b873b4decdba10d5f7010310e12c8e94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/support/zipball/6dba51efd6f2a32db21bc8684cd663915ab0e4d7", - "reference": "6dba51efd6f2a32db21bc8684cd663915ab0e4d7", + "url": "https://api.github.com/repos/filamentphp/support/zipball/31fcff80b873b4decdba10d5f7010310e12c8e94", + "reference": "31fcff80b873b4decdba10d5f7010310e12c8e94", "shasum": "" }, "require": { @@ -1536,7 +1540,7 @@ "illuminate/contracts": "^10.45|^11.0", "illuminate/support": "^10.45|^11.0", "illuminate/view": "^10.45|^11.0", - "kirschbaum-development/eloquent-power-joins": "^3.0", + "kirschbaum-development/eloquent-power-joins": "^3.0|^4.0", "livewire/livewire": "^3.4.10 <= 3.5.6", "php": "^8.1", "ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0", @@ -1572,20 +1576,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-27T13:16:20+00:00" + "time": "2024-10-08T14:24:29+00:00" }, { "name": "filament/tables", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/tables.git", - "reference": "07226fcd080f0f547aac31cf5117bfab192ea770" + "reference": "152bf46a8f2c46f047835771a67085c2866b039b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/tables/zipball/07226fcd080f0f547aac31cf5117bfab192ea770", - "reference": "07226fcd080f0f547aac31cf5117bfab192ea770", + "url": "https://api.github.com/repos/filamentphp/tables/zipball/152bf46a8f2c46f047835771a67085c2866b039b", + "reference": "152bf46a8f2c46f047835771a67085c2866b039b", "shasum": "" }, "require": { @@ -1624,20 +1628,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-27T13:16:23+00:00" + "time": "2024-10-08T14:24:25+00:00" }, { "name": "filament/widgets", - "version": "v3.2.115", + "version": "v3.2.117", "source": { "type": "git", "url": "https://github.com/filamentphp/widgets.git", - "reference": "06b70c4f260c91da03bdc51d1275543776ef7385" + "reference": "14ae503aae8265ddc48274debbf7b7aefc7afb0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/widgets/zipball/06b70c4f260c91da03bdc51d1275543776ef7385", - "reference": "06b70c4f260c91da03bdc51d1275543776ef7385", + "url": "https://api.github.com/repos/filamentphp/widgets/zipball/14ae503aae8265ddc48274debbf7b7aefc7afb0b", + "reference": "14ae503aae8265ddc48274debbf7b7aefc7afb0b", "shasum": "" }, "require": { @@ -1668,7 +1672,7 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-09-23T14:10:16+00:00" + "time": "2024-10-08T14:24:26+00:00" }, { "name": "fruitcake/php-cors", @@ -2216,27 +2220,28 @@ }, { "name": "kirschbaum-development/eloquent-power-joins", - "version": "3.5.8", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/kirschbaum-development/eloquent-power-joins.git", - "reference": "397ef08f15ceff48111fd7f57d9f1fd41bf1a453" + "reference": "c6c42a52c5a097cc11761e72782b2d0215692caf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/397ef08f15ceff48111fd7f57d9f1fd41bf1a453", - "reference": "397ef08f15ceff48111fd7f57d9f1fd41bf1a453", + "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/c6c42a52c5a097cc11761e72782b2d0215692caf", + "reference": "c6c42a52c5a097cc11761e72782b2d0215692caf", "shasum": "" }, "require": { - "illuminate/database": "^8.0|^9.0|^10.0|^11.0", - "illuminate/support": "^8.0|^9.0|^10.0|^11.0", - "php": "^8.0" + "illuminate/database": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", + "php": "^8.1" }, "require-dev": { + "friendsofphp/php-cs-fixer": "dev-master", "laravel/legacy-factories": "^1.0@dev", - "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", - "phpunit/phpunit": "^8.0|^9.0|^10.0" + "orchestra/testbench": "^8.0|^9.0", + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { @@ -2272,9 +2277,9 @@ ], "support": { "issues": "https://github.com/kirschbaum-development/eloquent-power-joins/issues", - "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/3.5.8" + "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/4.0.0" }, - "time": "2024-09-10T10:28:05+00:00" + "time": "2024-10-06T12:28:14+00:00" }, { "name": "laravel/fortify", @@ -2343,16 +2348,16 @@ }, { "name": "laravel/framework", - "version": "v11.26.0", + "version": "v11.27.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b" + "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b", - "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b", + "url": "https://api.github.com/repos/laravel/framework/zipball/a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", + "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", "shasum": "" }, "require": { @@ -2548,7 +2553,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-01T14:29:34+00:00" + "time": "2024-10-09T04:17:35+00:00" }, { "name": "laravel/prompts", @@ -2925,16 +2930,16 @@ }, { "name": "league/csv", - "version": "9.16.0", + "version": "9.17.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440" + "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/998280c6c34bd67d8125fdc8b45bae28d761b440", - "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", + "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", "shasum": "" }, "require": { @@ -2942,17 +2947,16 @@ "php": "^8.1.2" }, "require-dev": { - "doctrine/collections": "^2.2.2", "ext-dom": "*", "ext-xdebug": "*", - "friendsofphp/php-cs-fixer": "^3.57.1", - "phpbench/phpbench": "^1.2.15", - "phpstan/phpstan": "^1.11.1", - "phpstan/phpstan-deprecation-rules": "^1.2.0", + "friendsofphp/php-cs-fixer": "^3.64.0", + "phpbench/phpbench": "^1.3.1", + "phpstan/phpstan": "^1.12.5", + "phpstan/phpstan-deprecation-rules": "^1.2.1", "phpstan/phpstan-phpunit": "^1.4.0", - "phpstan/phpstan-strict-rules": "^1.6.0", - "phpunit/phpunit": "^10.5.16 || ^11.1.3", - "symfony/var-dumper": "^6.4.6 || ^7.0.7" + "phpstan/phpstan-strict-rules": "^1.6.1", + "phpunit/phpunit": "^10.5.16 || ^11.4.0", + "symfony/var-dumper": "^6.4.8 || ^7.1.5" }, "suggest": { "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes", @@ -2970,7 +2974,7 @@ "src/functions_include.php" ], "psr-4": { - "League\\Csv\\": "src" + "League\\Csv\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3009,20 +3013,20 @@ "type": "github" } ], - "time": "2024-05-24T11:04:54+00:00" + "time": "2024-10-10T10:30:28+00:00" }, { "name": "league/flysystem", - "version": "3.29.0", + "version": "3.29.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0" + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0", - "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319", + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319", "shasum": "" }, "require": { @@ -3090,9 +3094,9 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.29.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.29.1" }, - "time": "2024-09-29T11:59:11+00:00" + "time": "2024-10-08T08:58:34+00:00" }, { "name": "league/flysystem-local", @@ -3791,24 +3795,24 @@ }, { "name": "nette/schema", - "version": "v1.3.0", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188" + "reference": "da801d52f0354f70a638673c4a0f04e16529431d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", + "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d", + "reference": "da801d52f0354f70a638673c4a0f04e16529431d", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { - "nette/tester": "^2.4", + "nette/tester": "^2.5.2", "phpstan/phpstan-nette": "^1.0", "tracy/tracy": "^2.8" }, @@ -3847,9 +3851,9 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.0" + "source": "https://github.com/nette/schema/tree/v1.3.2" }, - "time": "2023-12-11T11:54:22+00:00" + "time": "2024-10-06T23:10:23+00:00" }, { "name": "nette/utils", @@ -3939,16 +3943,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.3.0", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a", - "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -3991,9 +3995,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-09-29T13:56:26+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "nunomaduro/termwind", @@ -8511,16 +8515,16 @@ }, { "name": "laravel/sail", - "version": "v1.34.0", + "version": "v1.35.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd" + "reference": "992bc2d9e52174c79515967f30849d21daa334d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/511e9c95b0f3ee778dc9e11e242bcd2af8e002cd", - "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd", + "url": "https://api.github.com/repos/laravel/sail/zipball/992bc2d9e52174c79515967f30849d21daa334d8", + "reference": "992bc2d9e52174c79515967f30849d21daa334d8", "shasum": "" }, "require": { @@ -8570,7 +8574,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-09-27T14:58:09+00:00" + "time": "2024-10-08T14:45:26+00:00" }, { "name": "mockery/mockery", @@ -9253,16 +9257,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.35", + "version": "10.5.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b" + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7ac8b4e63f456046dcb4c9787da9382831a1874b", - "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", "shasum": "" }, "require": { @@ -9334,7 +9338,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.35" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.36" }, "funding": [ { @@ -9350,7 +9354,7 @@ "type": "tidelift" } ], - "time": "2024-09-19T10:52:21+00:00" + "time": "2024-10-08T15:36:51+00:00" }, { "name": "sebastian/cli-parser", @@ -10777,7 +10781,8 @@ "prefer-lowest": false, "platform": { "php": "^8.2", - "ext-ftp": "*" + "ext-ftp": "*", + "ext-intl": "*" }, "platform-dev": [], "plugin-api-version": "2.6.0" diff --git a/docker/Dockerfile b/docker/Dockerfile index 634c2923..de5fecd3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,5 @@ -ARG RELEASE=1 - FROM ubuntu:22.04 -ENV RELEASE_ARG=$RELEASE - WORKDIR /var/www/html ENV DEBIAN_FRONTEND noninteractive @@ -12,19 +8,19 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get clean && apt-get update && apt-get update && apt-get upgrade -y && apt-get autoremove -y # requirements -RUN apt-get install -y software-properties-common curl zip unzip git gcc +RUN apt-get install -y software-properties-common curl zip unzip gcc # nginx RUN apt-get install -y nginx # php RUN apt-get update \ - && apt-get install -y cron gnupg gosu curl ca-certificates zip unzip git supervisor libcap2-bin libpng-dev \ + && apt-get install -y cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ python2 dnsutils librsvg2-bin fswatch wget \ && add-apt-repository ppa:ondrej/php -y \ && apt-get update \ && apt-get install -y php8.2 php8.2-fpm php8.2-mbstring php8.2-mcrypt php8.2-gd php8.2-xml \ - php8.2-curl php8.2-gettext php8.2-zip php8.2-bcmath php8.2-soap php8.2-redis php8.2-sqlite3 + php8.2-curl php8.2-gettext php8.2-zip php8.2-bcmath php8.2-soap php8.2-redis php8.2-sqlite3 php8.2-intl COPY docker/php.ini /etc/php/8.2/cli/conf.d/99-vito.ini # composer @@ -32,8 +28,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local # app RUN rm -rf /var/www/html -RUN git clone -b 1.x https://github.com/vitodeploy/vito.git /var/www/html -RUN [ "$RELEASE_ARG" = "1" ] && git checkout $(git tag -l --merged 1.x --sort=-v:refname | head -n 1) || true +COPY . /var/www/html +RUN rm -rf /var/www/html/.git /var/www/html/vendor /var/www/html/node_modules RUN composer install --no-dev --prefer-dist RUN chown -R www-data:www-data /var/www/html \ && chmod -R 755 /var/www/html/storage /var/www/html/bootstrap/cache diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 00000000..51b3aee8 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,21 @@ +services: + vito: + build: + context: ../ + dockerfile: docker/Dockerfile + environment: + NAME: "vito" + EMAIL: "vito@example.com" + PASSWORD: "password" + APP_KEY: "base64:UodiJrx3DkcMlizmoimNlDn+yd4q5f2VbkBay19rJwM=" + APP_PORT: 8000 + extra_hosts: + - 'host.docker.internal:host-gateway' + ports: + - '${APP_PORT:-80}:80' + - '${VITE_PORT:-5173}:${VITE_PORT:-5173}' + volumes: + - "vito-storage:/var/www/html/storage" +volumes: + vito-storage: + driver: local