diff --git a/app/Livewire/Settings/License.php b/app/Livewire/Settings/License.php deleted file mode 100644 index 79f8269f3..000000000 --- a/app/Livewire/Settings/License.php +++ /dev/null @@ -1,58 +0,0 @@ - 'nullable', - 'settings.is_resale_license_active' => 'nullable', - ]; - - protected $validationAttributes = [ - 'settings.resale_license' => 'License', - 'instance_id' => 'Instance Id (Do not change this)', - 'settings.is_resale_license_active' => 'Is License Active', - ]; - - public function mount() - { - if (! isCloud()) { - abort(404); - } - if (! isInstanceAdmin()) { - return redirect()->route('home'); - } - $this->instance_id = config('app.id'); - $this->settings = instanceSettings(); - } - - public function render() - { - return view('livewire.settings.license'); - } - - public function submit() - { - $this->validate(); - $this->settings->save(); - if ($this->settings->resale_license) { - try { - CheckResaleLicense::run(); - $this->dispatch('reloadWindow'); - } catch (\Throwable $e) { - session()->flash('error', 'Something went wrong. Please contact support.
Error: '.$e->getMessage()); - - return redirect()->route('settings.license'); - } - } - } -} diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index efda02496..d8334383b 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -359,7 +359,7 @@ function isDev(): bool function isCloud(): bool { - return ! config('.self_hosted'); + return ! config('constants.coolify.self_hosted'); } function translate_cron_expression($expression_to_validate): string diff --git a/composer.json b/composer.json index 6a1b1e2d5..9e34e8b23 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "poliander/cron": "^3.0", "purplepixie/phpdns": "^2.1", "pusher/pusher-php-server": "^7.2", - "resend/resend-laravel": "^0.14.0", + "resend/resend-laravel": "^0.15.0", "sentry/sentry-laravel": "^4.6", "socialiteproviders/microsoft-azure": "^5.1", "spatie/laravel-activitylog": "^4.7.3", @@ -58,8 +58,8 @@ "laravel/telescope": "^5.2", "mockery/mockery": "^1.5.1", "nunomaduro/collision": "^8.1", - "phpstan/phpstan": "^1.12.10", "pestphp/pest": "^3.5", + "phpstan/phpstan": "^1.12.10", "phpunit/phpunit": "^11.4", "serversideup/spin": "^2.3", "spatie/laravel-ignition": "^2.1.0", diff --git a/composer.lock b/composer.lock index 51e6b9a32..63d070405 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": "fffc935d2809f759ec8467ad802797f6", + "content-hash": "c19f791a42f2d1458409e399ff7d28ec", "packages": [ { "name": "3sidedcube/laravel-redoc", @@ -979,16 +979,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.325.6", + "version": "3.325.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "9e4be60c907ce5ef05ee36dafd42afd9944591c6" + "reference": "55852104253172e66c3358bf4c35281bbd8622b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9e4be60c907ce5ef05ee36dafd42afd9944591c6", - "reference": "9e4be60c907ce5ef05ee36dafd42afd9944591c6", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/55852104253172e66c3358bf4c35281bbd8622b2", + "reference": "55852104253172e66c3358bf4c35281bbd8622b2", "shasum": "" }, "require": { @@ -1071,9 +1071,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.325.6" + "source": "https://github.com/aws/aws-sdk-php/tree/3.325.7" }, - "time": "2024-11-11T19:05:26+00:00" + "time": "2024-11-12T19:27:31+00:00" }, { "name": "bacon/bacon-qr-code", @@ -2662,16 +2662,16 @@ }, { "name": "laravel/fortify", - "version": "v1.24.4", + "version": "v1.24.5", "source": { "type": "git", "url": "https://github.com/laravel/fortify.git", - "reference": "5bd3bdd535acf4054865c64eec6d8bb8c60cc127" + "reference": "bba8c2ecc3fcc78e8632e0d719ae10bef6343eef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/fortify/zipball/5bd3bdd535acf4054865c64eec6d8bb8c60cc127", - "reference": "5bd3bdd535acf4054865c64eec6d8bb8c60cc127", + "url": "https://api.github.com/repos/laravel/fortify/zipball/bba8c2ecc3fcc78e8632e0d719ae10bef6343eef", + "reference": "bba8c2ecc3fcc78e8632e0d719ae10bef6343eef", "shasum": "" }, "require": { @@ -2723,20 +2723,20 @@ "issues": "https://github.com/laravel/fortify/issues", "source": "https://github.com/laravel/fortify" }, - "time": "2024-10-29T13:59:23+00:00" + "time": "2024-11-12T14:51:12+00:00" }, { "name": "laravel/framework", - "version": "v11.30.0", + "version": "v11.31.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "dff716442d9c229d716be82ccc9a7de52eb97193" + "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/dff716442d9c229d716be82ccc9a7de52eb97193", - "reference": "dff716442d9c229d716be82ccc9a7de52eb97193", + "url": "https://api.github.com/repos/laravel/framework/zipball/365090ed2c68244e3141cdb5e247cdf3dfba2c40", + "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40", "shasum": "" }, "require": { @@ -2932,20 +2932,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-30T15:00:34+00:00" + "time": "2024-11-12T15:36:15+00:00" }, { "name": "laravel/horizon", - "version": "v5.29.2", + "version": "v5.29.3", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "d9c39ce4e9050b33a2ff9d2cee21646a18d4cc92" + "reference": "a48d242759704e598242074daf0060bbeb6ed46d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/d9c39ce4e9050b33a2ff9d2cee21646a18d4cc92", - "reference": "d9c39ce4e9050b33a2ff9d2cee21646a18d4cc92", + "url": "https://api.github.com/repos/laravel/horizon/zipball/a48d242759704e598242074daf0060bbeb6ed46d", + "reference": "a48d242759704e598242074daf0060bbeb6ed46d", "shasum": "" }, "require": { @@ -3010,22 +3010,22 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.29.2" + "source": "https://github.com/laravel/horizon/tree/v5.29.3" }, - "time": "2024-10-16T21:36:57+00:00" + "time": "2024-11-07T21:51:45+00:00" }, { "name": "laravel/pail", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/laravel/pail.git", - "reference": "085a2306b520c3896afa361c25704e5fa3c27bf0" + "reference": "353ac12134b98e2e7c3333d916bd3e523931e583" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pail/zipball/085a2306b520c3896afa361c25704e5fa3c27bf0", - "reference": "085a2306b520c3896afa361c25704e5fa3c27bf0", + "url": "https://api.github.com/repos/laravel/pail/zipball/353ac12134b98e2e7c3333d916bd3e523931e583", + "reference": "353ac12134b98e2e7c3333d916bd3e523931e583", "shasum": "" }, "require": { @@ -3040,8 +3040,9 @@ "symfony/console": "^6.0|^7.0" }, "require-dev": { + "laravel/framework": "^10.24|^11.0", "laravel/pint": "^1.13", - "orchestra/testbench": "^8.12|^9.0", + "orchestra/testbench-core": "^8.12|^9.0", "pestphp/pest": "^2.20", "pestphp/pest-plugin-type-coverage": "^2.3", "phpstan/phpstan": "^1.10", @@ -3089,25 +3090,25 @@ "issues": "https://github.com/laravel/pail/issues", "source": "https://github.com/laravel/pail" }, - "time": "2024-10-21T13:59:30+00:00" + "time": "2024-10-23T12:56:23+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.25", + "version": "v0.3.2", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95" + "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95", - "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95", + "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f", + "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f", "shasum": "" }, "require": { + "composer-runtime-api": "^2.2", "ext-mbstring": "*", - "illuminate/collections": "^10.0|^11.0", "php": "^8.1", "symfony/console": "^6.2|^7.0" }, @@ -3116,8 +3117,9 @@ "laravel/framework": ">=10.17.0 <10.25.0" }, "require-dev": { + "illuminate/collections": "^10.0|^11.0", "mockery/mockery": "^1.5", - "pestphp/pest": "^2.3", + "pestphp/pest": "^2.3|^3.4", "phpstan/phpstan": "^1.11", "phpstan/phpstan-mockery": "^1.1" }, @@ -3127,7 +3129,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.1.x-dev" + "dev-main": "0.3.x-dev" } }, "autoload": { @@ -3145,9 +3147,9 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.25" + "source": "https://github.com/laravel/prompts/tree/v0.3.2" }, - "time": "2024-08-12T22:06:33+00:00" + "time": "2024-11-12T14:59:47+00:00" }, { "name": "laravel/sanctum", @@ -3215,16 +3217,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.3.5", + "version": "v1.3.6", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c" + "reference": "f865a58ea3a0107c336b7045104c75243fa59d96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", - "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96", + "reference": "f865a58ea3a0107c336b7045104c75243fa59d96", "shasum": "" }, "require": { @@ -3272,7 +3274,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2024-09-23T13:33:08+00:00" + "time": "2024-11-11T17:06:04+00:00" }, { "name": "laravel/socialite", @@ -4356,27 +4358,27 @@ }, { "name": "log1x/laravel-webfonts", - "version": "v1.0.1", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/Log1x/laravel-webfonts.git", - "reference": "0d38122aa7f5501394006a6715f7d97dac223507" + "reference": "128a20af26f02db84df21abc6524e5a069cf20a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Log1x/laravel-webfonts/zipball/0d38122aa7f5501394006a6715f7d97dac223507", - "reference": "0d38122aa7f5501394006a6715f7d97dac223507", + "url": "https://api.github.com/repos/Log1x/laravel-webfonts/zipball/128a20af26f02db84df21abc6524e5a069cf20a4", + "reference": "128a20af26f02db84df21abc6524e5a069cf20a4", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^7.8", - "laravel/prompts": "^0.1.15", + "laravel/prompts": "^0.1|^0.2|^0.3", "php": ">=8.1" }, "require-dev": { - "illuminate/console": "^10.41", - "illuminate/http": "^10.41", - "illuminate/support": "^10.41", + "illuminate/console": "^10.0|^11.0", + "illuminate/http": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", "laravel/pint": "^1.13" }, "type": "package", @@ -4406,7 +4408,7 @@ "description": "Download, install, and preload over 1500 Google fonts locally in your Laravel project", "support": { "issues": "https://github.com/Log1x/laravel-webfonts/issues", - "source": "https://github.com/Log1x/laravel-webfonts/tree/v1.0.1" + "source": "https://github.com/Log1x/laravel-webfonts/tree/v1.0.2" }, "funding": [ { @@ -4414,7 +4416,7 @@ "type": "github" } ], - "time": "2024-03-28T11:53:11+00:00" + "time": "2024-11-12T19:00:31+00:00" }, { "name": "lorisleiva/laravel-actions", @@ -4566,16 +4568,16 @@ }, { "name": "monolog/monolog", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67", + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67", "shasum": "" }, "require": { @@ -4595,12 +4597,14 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpstan/phpstan": "^1.9", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-strict-rules": "^1.4", - "phpunit/phpunit": "^10.5.17", + "php-console/php-console": "^3.1.8", + "phpstan/phpstan": "^2", + "phpstan/phpstan-deprecation-rules": "^2", + "phpstan/phpstan-strict-rules": "^2", + "phpunit/phpunit": "^10.5.17 || ^11.0.7", "predis/predis": "^1.1 || ^2", - "ruflin/elastica": "^7", + "rollbar/rollbar": "^4.0", + "ruflin/elastica": "^7 || ^8", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -4651,7 +4655,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.7.0" + "source": "https://github.com/Seldaek/monolog/tree/3.8.0" }, "funding": [ { @@ -4663,7 +4667,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:40:51+00:00" + "time": "2024-11-12T13:57:08+00:00" }, { "name": "mtdowling/jmespath.php", @@ -5591,16 +5595,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.5.1", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0c70d2c566e899666f367ab7b80986beb3581e6f", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -5609,7 +5613,7 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { @@ -5649,9 +5653,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, - "time": "2024-11-06T11:58:54+00:00" + "time": "2024-11-12T11:25:25+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -5898,30 +5902,30 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.33.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", - "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "type": "library", @@ -5939,9 +5943,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" }, - "time": "2024-10-13T11:25:22+00:00" + "time": "2024-10-13T11:29:49+00:00" }, { "name": "pion/laravel-chunk-upload", @@ -6981,23 +6985,23 @@ }, { "name": "resend/resend-laravel", - "version": "v0.14.0", + "version": "v0.15.0", "source": { "type": "git", "url": "https://github.com/resend/resend-laravel.git", - "reference": "74a5a00efc17935918b6f20f2eb4553ecad3b164" + "reference": "af914817abc6abaa4522b5cfb177f3519493fd6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/resend/resend-laravel/zipball/74a5a00efc17935918b6f20f2eb4553ecad3b164", - "reference": "74a5a00efc17935918b6f20f2eb4553ecad3b164", + "url": "https://api.github.com/repos/resend/resend-laravel/zipball/af914817abc6abaa4522b5cfb177f3519493fd6e", + "reference": "af914817abc6abaa4522b5cfb177f3519493fd6e", "shasum": "" }, "require": { "illuminate/http": "^10.0|^11.0", "illuminate/support": "^10.0|^11.0", "php": "^8.1", - "resend/resend-php": "^0.12.0", + "resend/resend-php": "^0.14.0", "symfony/mailer": "^6.2|^7.0" }, "require-dev": { @@ -7044,22 +7048,22 @@ ], "support": { "issues": "https://github.com/resend/resend-laravel/issues", - "source": "https://github.com/resend/resend-laravel/tree/v0.14.0" + "source": "https://github.com/resend/resend-laravel/tree/v0.15.0" }, - "time": "2024-07-18T21:55:31+00:00" + "time": "2024-11-04T18:34:08+00:00" }, { "name": "resend/resend-php", - "version": "v0.12.0", + "version": "v0.14.0", "source": { "type": "git", "url": "https://github.com/resend/resend-php.git", - "reference": "37fb79bb8160ce2de521bf37484ba59e89236521" + "reference": "d7900752bb9839421d40d9e66362bffb3ec07aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/resend/resend-php/zipball/37fb79bb8160ce2de521bf37484ba59e89236521", - "reference": "37fb79bb8160ce2de521bf37484ba59e89236521", + "url": "https://api.github.com/repos/resend/resend-php/zipball/d7900752bb9839421d40d9e66362bffb3ec07aac", + "reference": "d7900752bb9839421d40d9e66362bffb3ec07aac", "shasum": "" }, "require": { @@ -7101,9 +7105,9 @@ ], "support": { "issues": "https://github.com/resend/resend-php/issues", - "source": "https://github.com/resend/resend-php/tree/v0.12.0" + "source": "https://github.com/resend/resend-php/tree/v0.14.0" }, - "time": "2024-03-04T03:16:28+00:00" + "time": "2024-11-01T02:00:44+00:00" }, { "name": "revolt/event-loop", @@ -8118,16 +8122,16 @@ }, { "name": "symfony/console", - "version": "v7.1.7", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a" + "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3284aafcac338b6e86fd955ee4d794cbe434151a", - "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a", + "url": "https://api.github.com/repos/symfony/console/zipball/ff04e5b5ba043d2badfb308197b9e6b42883fcd5", + "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5", "shasum": "" }, "require": { @@ -8191,7 +8195,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.7" + "source": "https://github.com/symfony/console/tree/v7.1.8" }, "funding": [ { @@ -8207,7 +8211,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:55+00:00" + "time": "2024-11-06T14:23:19+00:00" }, { "name": "symfony/css-selector", @@ -8638,16 +8642,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.1.7", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "5183b61657807099d98f3367bcccb850238b17a9" + "reference": "f4419ec69ccfc3f725a4de7c20e4e57626d10112" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5183b61657807099d98f3367bcccb850238b17a9", - "reference": "5183b61657807099d98f3367bcccb850238b17a9", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4419ec69ccfc3f725a4de7c20e4e57626d10112", + "reference": "f4419ec69ccfc3f725a4de7c20e4e57626d10112", "shasum": "" }, "require": { @@ -8657,12 +8661,12 @@ }, "conflict": { "doctrine/dbal": "<3.6", - "symfony/cache": "<6.4" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "require-dev": { "doctrine/dbal": "^3.6|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.4|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^6.4|^7.0", "symfony/expression-language": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", @@ -8695,7 +8699,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.1.7" + "source": "https://github.com/symfony/http-foundation/tree/v7.1.8" }, "funding": [ { @@ -8711,20 +8715,20 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:02:46+00:00" + "time": "2024-11-09T09:16:45+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.1.7", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "7f137cda31fd41e422edcdc01915f2c095b84399" + "reference": "33fef24e3dc79d6d30bf4936531f2f4bd2ca189e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7f137cda31fd41e422edcdc01915f2c095b84399", - "reference": "7f137cda31fd41e422edcdc01915f2c095b84399", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33fef24e3dc79d6d30bf4936531f2f4bd2ca189e", + "reference": "33fef24e3dc79d6d30bf4936531f2f4bd2ca189e", "shasum": "" }, "require": { @@ -8809,7 +8813,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.1.7" + "source": "https://github.com/symfony/http-kernel/tree/v7.1.8" }, "funding": [ { @@ -8825,7 +8829,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:54:34+00:00" + "time": "2024-11-13T14:25:32+00:00" }, { "name": "symfony/mailer", @@ -9696,16 +9700,16 @@ }, { "name": "symfony/process", - "version": "v7.1.7", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "9b8a40b7289767aa7117e957573c2a535efe6585" + "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585", - "reference": "9b8a40b7289767aa7117e957573c2a535efe6585", + "url": "https://api.github.com/repos/symfony/process/zipball/42783370fda6e538771f7c7a36e9fa2ee3a84892", + "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892", "shasum": "" }, "require": { @@ -9737,7 +9741,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.7" + "source": "https://github.com/symfony/process/tree/v7.1.8" }, "funding": [ { @@ -9753,7 +9757,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:25:12+00:00" + "time": "2024-11-06T14:23:19+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -10004,16 +10008,16 @@ }, { "name": "symfony/string", - "version": "v7.1.6", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626" + "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626", - "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626", + "url": "https://api.github.com/repos/symfony/string/zipball/591ebd41565f356fcd8b090fe64dbb5878f50281", + "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281", "shasum": "" }, "require": { @@ -10071,7 +10075,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.6" + "source": "https://github.com/symfony/string/tree/v7.1.8" }, "funding": [ { @@ -10087,7 +10091,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-11-13T13:31:21+00:00" }, { "name": "symfony/translation", @@ -10337,16 +10341,16 @@ }, { "name": "symfony/var-dumper", - "version": "v7.1.7", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f6ea51f669760cacd7464bf7eaa0be87b8072db1" + "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f6ea51f669760cacd7464bf7eaa0be87b8072db1", - "reference": "f6ea51f669760cacd7464bf7eaa0be87b8072db1", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8", + "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8", "shasum": "" }, "require": { @@ -10400,7 +10404,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.1.7" + "source": "https://github.com/symfony/var-dumper/tree/v7.1.8" }, "funding": [ { @@ -10416,7 +10420,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:55+00:00" + "time": "2024-11-08T15:46:42+00:00" }, { "name": "symfony/yaml", @@ -11434,16 +11438,16 @@ }, { "name": "laravel/dusk", - "version": "v8.2.10", + "version": "v8.2.11", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "fde2ae6c1b32d2f8dbdcff300bbd6e2ccffb1bb4" + "reference": "c667db6d8795f0ccc8f63d54a7780ce8a0cc3d3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/fde2ae6c1b32d2f8dbdcff300bbd6e2ccffb1bb4", - "reference": "fde2ae6c1b32d2f8dbdcff300bbd6e2ccffb1bb4", + "url": "https://api.github.com/repos/laravel/dusk/zipball/c667db6d8795f0ccc8f63d54a7780ce8a0cc3d3c", + "reference": "c667db6d8795f0ccc8f63d54a7780ce8a0cc3d3c", "shasum": "" }, "require": { @@ -11500,9 +11504,9 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v8.2.10" + "source": "https://github.com/laravel/dusk/tree/v8.2.11" }, - "time": "2024-10-22T13:58:17+00:00" + "time": "2024-11-07T21:51:32+00:00" }, { "name": "laravel/pint", @@ -11572,16 +11576,16 @@ }, { "name": "laravel/telescope", - "version": "v5.2.4", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "749369e996611d803e7c1b57929b482dd676008d" + "reference": "f68386a8d816c9e3a011b8301bfd263213bf00d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/749369e996611d803e7c1b57929b482dd676008d", - "reference": "749369e996611d803e7c1b57929b482dd676008d", + "url": "https://api.github.com/repos/laravel/telescope/zipball/f68386a8d816c9e3a011b8301bfd263213bf00d4", + "reference": "f68386a8d816c9e3a011b8301bfd263213bf00d4", "shasum": "" }, "require": { @@ -11635,9 +11639,9 @@ ], "support": { "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/v5.2.4" + "source": "https://github.com/laravel/telescope/tree/v5.2.5" }, - "time": "2024-10-29T15:35:13+00:00" + "time": "2024-10-31T17:06:07+00:00" }, { "name": "maximebf/debugbar", @@ -14645,16 +14649,16 @@ }, { "name": "symfony/http-client", - "version": "v7.1.7", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "90ab2a4992dcf5d1f19a9b8737eba36a7c305fd0" + "reference": "c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/90ab2a4992dcf5d1f19a9b8737eba36a7c305fd0", - "reference": "90ab2a4992dcf5d1f19a9b8737eba36a7c305fd0", + "url": "https://api.github.com/repos/symfony/http-client/zipball/c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a", + "reference": "c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a", "shasum": "" }, "require": { @@ -14719,7 +14723,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.1.7" + "source": "https://github.com/symfony/http-client/tree/v7.1.8" }, "funding": [ { @@ -14735,7 +14739,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T16:45:54+00:00" + "time": "2024-11-13T13:40:27+00:00" }, { "name": "symfony/http-client-contracts", diff --git a/config/constants.php b/config/constants.php index 5c54cea0d..532feb56c 100644 --- a/config/constants.php +++ b/config/constants.php @@ -78,7 +78,7 @@ ], 'waitlist' => [ - 'enabled' => env('WAITLIST', true), + 'enabled' => env('WAITLIST', false), 'expiration' => 10, ], diff --git a/docker/coolify-helper/Dockerfile b/docker/coolify-helper/Dockerfile index 48f401da4..c375db5f8 100644 --- a/docker/coolify-helper/Dockerfile +++ b/docker/coolify-helper/Dockerfile @@ -1,16 +1,29 @@ -FROM alpine:3.17 - -ARG TARGETPLATFORM +# Versions +# https://hub.docker.com/_/alpine +ARG BASE_IMAGE=alpine:3.20 # https://download.docker.com/linux/static/stable/ -ARG DOCKER_VERSION=26.1.3 +ARG DOCKER_VERSION=27.3.1 # https://github.com/docker/compose/releases -ARG DOCKER_COMPOSE_VERSION=2.27.1 +ARG DOCKER_COMPOSE_VERSION=2.30.3 # https://github.com/docker/buildx/releases -ARG DOCKER_BUILDX_VERSION=0.14.1 +ARG DOCKER_BUILDX_VERSION=0.18.0 # https://github.com/buildpacks/pack/releases ARG PACK_VERSION=0.35.1 # https://github.com/railwayapp/nixpacks/releases ARG NIXPACKS_VERSION=1.29.0 +# https://hub.docker.com/r/minio/mc/tags +ARG MINIO_VERSION=RELEASE.2024-03-07T00-31-49Z + +FROM minio/mc:${MINIO_VERSION} AS minio-client + +FROM ${BASE_IMAGE} AS base + +ARG TARGETPLATFORM +ARG DOCKER_VERSION +ARG DOCKER_COMPOSE_VERSION +ARG DOCKER_BUILDX_VERSION +ARG PACK_VERSION +ARG NIXPACKS_VERSION USER root WORKDIR /artifacts @@ -34,9 +47,8 @@ RUN if [[ ${TARGETPLATFORM} == 'linux/arm64' ]]; then \ chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack /root/.docker/cli-plugins/docker-buildx \ ;fi -COPY --from=minio/mc:RELEASE.2024-09-09T07-53-10Z /usr/bin/mc /usr/bin/mc +COPY --from=minio-client /usr/bin/mc /usr/bin/mc RUN chmod +x /usr/bin/mc ENTRYPOINT ["/sbin/tini", "--"] CMD ["tail", "-f", "/dev/null"] - diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index d2381f764..e90521759 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,10 +1,21 @@ -FROM serversideup/php:8.2-fpm-nginx-v2.2.1 +# Versions +# https://hub.docker.com/r/serversideup/php/tags?name=8.3-fpm-nginx-alpine +ARG SERVERSIDEUP_PHP_VERSION=8.2-fpm-nginx-v2.2.1 +# https://github.com/minio/mc/releases +ARG MINIO_VERSION=RELEASE.2024-11-05T11-29-45Z +# https://github.com/cloudflare/cloudflared/releases +ARG CLOUDFLARED_VERSION=2024.11.0 +# https://www.postgresql.org/support/versioning/ - Can not updated automatically so keep it at 15 +ARG POSTGRES_VERSION=15 + +FROM minio/mc:${MINIO_VERSION} AS minio-client + +FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION} ARG TARGETPLATFORM -# https://github.com/cloudflare/cloudflared/releases -ARG CLOUDFLARED_VERSION=2024.4.1 - -ARG POSTGRES_VERSION=15 +ARG CLOUDFLARED_VERSION +ARG MINIO_VERSION +ARG POSTGRES_VERSION # Use build arguments for caching ARG BUILDTIME_DEPS="dirmngr ca-certificates software-properties-common gnupg gnupg2 apt-transport-https curl" @@ -41,7 +52,7 @@ RUN --mount=type=cache,target=/root/.cache \ curl -L https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \ ;fi" -COPY --from=minio/mc:RELEASE.2024-09-09T07-53-10Z /usr/bin/mc /usr/bin/mc +COPY --from=minio-client /usr/bin/mc /usr/bin/mc RUN chmod +x /usr/bin/mc RUN { \ diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 74c1e196b..ca34bb05b 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,6 +1,6 @@ # Versions # https://hub.docker.com/r/serversideup/php/tags?name=8.3-fpm-nginx-alpine -ARG SERVERSIDEUP_PHP_VERSION=8.3-fpm-nginx-alpine +ARG SERVERSIDEUP_PHP_VERSION=8.2-fpm-nginx-v2.2.1 # https://github.com/minio/mc/releases ARG MINIO_VERSION=RELEASE.2024-11-05T11-29-45Z # https://github.com/cloudflare/cloudflared/releases @@ -8,115 +8,82 @@ ARG CLOUDFLARED_VERSION=2024.11.0 # https://www.postgresql.org/support/versioning/ - Can not updated automatically so keep it at 15 ARG POSTGRES_VERSION=15 -# ================================================================= -# Stage 1: Composer dependencies -# ================================================================= -FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION} AS base +FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION} AS base WORKDIR /var/www/html -COPY --chown=www-data:www-data composer.json composer.lock ./ + +COPY composer.json composer.lock ./ RUN composer install --no-dev --no-interaction --no-plugins --no-scripts --prefer-dist -# ================================================================= -# Stage 2: Frontend assets compilation -# ================================================================= -FROM node:20-alpine AS static-assets - +FROM node:20 AS static-assets WORKDIR /app -COPY package*.json vite.config.js tailwind.config.js postcss.config.cjs ./ -COPY public ./public -COPY resources ./resources -RUN npm ci && npm run build +COPY . . +COPY --from=base --chown=9999:9999 /var/www/html . +RUN npm install +RUN npm run build -# ================================================================= -# Stage 3: Get MinIO client -# ================================================================= FROM minio/mc:${MINIO_VERSION} AS minio-client -# ================================================================= -# Final Stage: Production image -# ================================================================= FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION} ARG TARGETPLATFORM -ARG POSTGRES_VERSION ARG CLOUDFLARED_VERSION +ARG POSTGRES_VERSION ARG CI=true WORKDIR /var/www/html -USER root +RUN apt-get update +# Postgres version requirements +RUN apt install dirmngr ca-certificates software-properties-common gnupg gnupg2 apt-transport-https curl -y +RUN curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null -# Install PostgreSQL repository and keys -RUN apk add --no-cache gnupg && \ - mkdir -p /usr/share/keyrings && \ - curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg +RUN echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main | tee -a /etc/apt/sources.list.d/postgresql.list -# Install system dependencies -RUN apk add --no-cache \ - postgresql${POSTGRES_VERSION}-client \ - openssh-client \ - git \ - git-lfs \ - jq \ - lsof +RUN apt-get update +RUN apt-get install postgresql-client-${POSTGRES_VERSION} -y -# Configure shell aliases -RUN echo "alias ll='ls -al'" >> /etc/profile && \ - echo "alias a='php artisan'" >> /etc/profile && \ - echo "alias logs='tail -f storage/logs/laravel.log'" >> /etc/profile +# Coolify requirements +RUN apt-get install -y php8.2-pgsql openssh-client git git-lfs jq lsof vim +RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -# Install Cloudflared based on architecture -RUN mkdir -p /usr/local/bin && \ - if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ - curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64" -o /usr/local/bin/cloudflared; \ - elif [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \ - curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64" -o /usr/local/bin/cloudflared; \ - fi && \ - chmod +x /usr/local/bin/cloudflared - -# Configure PHP -RUN echo 'upload_max_filesize=256M' > /usr/local/etc/php/conf.d/upload-limits.ini && \ - echo 'post_max_size=256M' >> /usr/local/etc/php/conf.d/upload-limits.ini -ENV PHP_OPCACHE_ENABLE=1 - -# Copy application files from previous stages -COPY --from=base --chown=www-data:www-data /var/www/html/vendor ./vendor -COPY --from=static-assets --chown=www-data:www-data /app/public/build ./public/build - -# Copy application source code -COPY --chown=www-data:www-data composer.json composer.lock ./ -COPY --chown=www-data:www-data app ./app -COPY --chown=www-data:www-data bootstrap ./bootstrap -COPY --chown=www-data:www-data config ./config -COPY --chown=www-data:www-data database ./database -COPY --chown=www-data:www-data lang ./lang -COPY --chown=www-data:www-data public ./public -COPY --chown=www-data:www-data routes ./routes -COPY --chown=www-data:www-data storage ./storage -COPY --chown=www-data:www-data templates ./templates -COPY --chown=www-data:www-data artisan artisan - -# Configure Nginx and S6 overlay COPY docker/prod/nginx.conf /etc/nginx/conf.d/custom.conf + +COPY --from=base --chown=9999:9999 /var/www/html . + +COPY --chown=9999:9999 . . +RUN composer dump-autoload + +COPY --from=static-assets --chown=9999:9999 /app/public/build ./public/build COPY --chmod=755 docker/prod/etc/s6-overlay/ /etc/s6-overlay/ -RUN mkdir -p /etc/nginx/conf.d && \ - chown -R www-data:www-data /etc/nginx && \ - chmod -R 755 /etc/nginx +RUN php artisan route:clear +RUN php artisan view:clear +RUN php artisan config:clear +RUN php artisan route:cache +RUN php artisan view:cache +RUN php artisan config:cache + +RUN echo "alias ll='ls -al'" >>/etc/bash.bashrc +RUN echo "alias a='php artisan'" >>/etc/bash.bashrc +RUN echo "alias logs='tail -f storage/logs/laravel.log'" >>/etc/bash.bashrc + +RUN mkdir -p /usr/local/bin + +RUN /bin/bash -c "if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \ + echo 'amd64' && \ + curl -sSL https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \ + ;fi" + +RUN /bin/bash -c "if [[ ${TARGETPLATFORM} == 'linux/arm64' ]]; then \ + echo 'arm64' && \ + curl -L https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \ + ;fi" + +RUN { \ + echo 'upload_max_filesize=256M'; \ + echo 'post_max_size=256M'; \ + } > /etc/php/current_version/cli/conf.d/upload-limits.ini -# Install MinIO client COPY --from=minio-client /usr/bin/mc /usr/bin/mc -RUN chmod +x /usr/bin/mc - -# Switch to non-root user -USER www-data - -# Optimize Laravel application -RUN composer dump-autoload && \ - php artisan route:clear && \ - php artisan view:clear && \ - php artisan config:clear && \ - php artisan route:cache && \ - php artisan view:cache && \ - php artisan config:cache +RUN chmod +x /usr/bin/mc \ No newline at end of file diff --git a/docker/testing-host/Dockerfile b/docker/testing-host/Dockerfile index deb09eeba..d98fcc821 100644 --- a/docker/testing-host/Dockerfile +++ b/docker/testing-host/Dockerfile @@ -1,16 +1,22 @@ +# Versions +# https://download.docker.com/linux/static/stable/ +ARG DOCKER_VERSION=27.3.1 +# https://github.com/docker/compose/releases +ARG DOCKER_COMPOSE_VERSION=2.30.3 +# https://github.com/docker/buildx/releases +ARG DOCKER_BUILDX_VERSION=0.18.0 + + FROM debian:12-slim ARG TARGETPLATFORM -# https://download.docker.com/linux/static/stable/ -ARG DOCKER_VERSION=26.1.2 -# https://github.com/docker/compose/releases -ARG DOCKER_COMPOSE_VERSION=2.27.0 -# https://github.com/docker/buildx/releases -ARG DOCKER_BUILDX_VERSION=0.14.0 +ARG DOCKER_VERSION +ARG DOCKER_COMPOSE_VERSION +ARG DOCKER_BUILDX_VERSION USER root WORKDIR /root -ENV PATH "$PATH:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin" +ENV PATH="/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin:$PATH" RUN apt update && apt -y install openssh-client openssh-server curl wget git jq jc RUN mkdir -p ~/.docker/cli-plugins diff --git a/other/nightly/install.sh b/other/nightly/install.sh index 2371cca2c..876e8c6e2 100755 --- a/other/nightly/install.sh +++ b/other/nightly/install.sh @@ -9,7 +9,7 @@ CDN="https://cdn.coollabs.io/coolify-nightly" DATE=$(date +"%Y%m%d-%H%M%S") VERSION="1.6" -DOCKER_VERSION="26.0" +DOCKER_VERSION="27.3" # TODO: Ask for a user CURRENT_USER=$USER diff --git a/package-lock.json b/package-lock.json index 6626fab01..22398dcf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,12 +14,12 @@ "ioredis": "5.4.1" }, "devDependencies": { - "@vitejs/plugin-vue": "5.1.5", + "@vitejs/plugin-vue": "5.2.0", "autoprefixer": "10.4.20", "axios": "1.7.7", - "laravel-echo": "1.16.1", - "laravel-vite-plugin": "1.0.5", - "postcss": "8.4.48", + "laravel-echo": "1.17.0", + "laravel-vite-plugin": "1.0.6", + "postcss": "8.4.49", "pusher-js": "8.4.0-rc2", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "3.4.14", @@ -864,9 +864,9 @@ "license": "MIT" }, "node_modules/@vitejs/plugin-vue": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.5.tgz", - "integrity": "sha512-dlnib73G05CDBAUR/YpuZcQQ47fpjihnnNouAAqN62z+oqSsWJ+kh52GRzIxpkgFG3q11eXK7Di7RMmoCwISZA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.0.tgz", + "integrity": "sha512-7n7KdUEtx/7Yl7I/WVAMZ1bEb0eVvXF3ummWTeLcs/9gvo9pJhuLdouSXGjdZ/MKD1acf1I272+X0RMua4/R3g==", "dev": true, "license": "MIT", "engines": { @@ -1712,18 +1712,19 @@ } }, "node_modules/laravel-echo": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.1.tgz", - "integrity": "sha512-++Ylb6M3ariC9Rk5WE5gZjj6wcEV5kvLF8b+geJ5/rRIfdoOA+eG6b9qJPrarMD9rY28Apx+l3eelIrCc2skVg==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.17.0.tgz", + "integrity": "sha512-uf+BVZMkXc7+pzxS2dG5v1P+MT3yWS+/9oDSJUcQ4KqnDKLYfM1lc7yUmnxvLtwPksGuQJv6XBtzvWLHSEheNQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/laravel-vite-plugin": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.5.tgz", - "integrity": "sha512-Zv+to82YLBknDCZ6g3iwOv9wZ7f6EWStb9pjSm7MGe9Mfoy5ynT2ssZbGsMr1udU6rDg9HOoYEVGw5Qf+p9zbw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.6.tgz", + "integrity": "sha512-B34OqmZc/rV1KvSjst8SsUm/LKHsuDusw8jiZCIhlnTHXbXnK89JUM9pTJuk6E/Vc/1DT2gX7qNfhipak1WS8w==", "dev": true, "license": "MIT", "dependencies": { @@ -1975,9 +1976,9 @@ } }, "node_modules/postcss": { - "version": "8.4.48", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.48.tgz", - "integrity": "sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA==", + "version": "8.4.49", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", + "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", "funding": [ { "type": "opencollective", diff --git a/package.json b/package.json index e45c435b4..a174d73c7 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,12 @@ "build": "vite build" }, "devDependencies": { - "@vitejs/plugin-vue": "5.1.5", + "@vitejs/plugin-vue": "5.2.0", "autoprefixer": "10.4.20", "axios": "1.7.7", - "laravel-echo": "1.16.1", - "laravel-vite-plugin": "1.0.5", - "postcss": "8.4.48", + "laravel-echo": "1.17.0", + "laravel-vite-plugin": "1.0.6", + "postcss": "8.4.49", "pusher-js": "8.4.0-rc2", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "3.4.14", diff --git a/resources/views/components/settings/navbar.blade.php b/resources/views/components/settings/navbar.blade.php index 4839893e0..a54dc1886 100644 --- a/resources/views/components/settings/navbar.blade.php +++ b/resources/views/components/settings/navbar.blade.php @@ -7,12 +7,6 @@ href="{{ route('settings.index') }}"> - @if (isCloud()) - - - - @endif diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php index ed2a6dec9..994ce6790 100644 --- a/resources/views/livewire/project/service/configuration.blade.php +++ b/resources/views/livewire/project/service/configuration.blade.php @@ -180,7 +180,7 @@ class="w-4 h-4 dark:text-warning text-coollabs"
Persistent storage to preserve data between deployments.
If you would like to add a volume, you must add it to - your compose file (General tab).
+ your compose file (Service Stack tab). @foreach ($applications as $application) diff --git a/resources/views/livewire/settings/license.blade.php b/resources/views/livewire/settings/license.blade.php deleted file mode 100644 index 31dc0fb94..000000000 --- a/resources/views/livewire/settings/license.blade.php +++ /dev/null @@ -1,28 +0,0 @@ -
- -

Resale License

-
-
- @if ($settings->is_resale_license_active) -
License is active
- @else -
License is not active
- @endif -
-
- - -
-
- - Check License - -
- @if (session()->has('error')) -
- {!! session('error') !!} -
- @endif -
-
diff --git a/routes/web.php b/routes/web.php index 190294561..e90bbfac7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -49,7 +49,6 @@ use App\Livewire\Server\Resources as ResourcesShow; use App\Livewire\Server\Show as ServerShow; use App\Livewire\Settings\Index as SettingsIndex; -use App\Livewire\Settings\License as SettingsLicense; use App\Livewire\SettingsBackup; use App\Livewire\SettingsEmail; use App\Livewire\SettingsOauth; @@ -122,7 +121,6 @@ Route::get('/settings/backup', SettingsBackup::class)->name('settings.backup'); Route::get('/settings/email', SettingsEmail::class)->name('settings.email'); Route::get('/settings/oauth', SettingsOauth::class)->name('settings.oauth'); - Route::get('/settings/license', SettingsLicense::class)->name('settings.license'); Route::get('/profile', ProfileIndex::class)->name('profile');