diff --git a/frameworks/PHP/laravel/benchmark_config.json b/frameworks/PHP/laravel/benchmark_config.json index 716cbea52a7..8a2f001e6c8 100644 --- a/frameworks/PHP/laravel/benchmark_config.json +++ b/frameworks/PHP/laravel/benchmark_config.json @@ -14,7 +14,7 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", - "flavor": "PHP8.1", + "flavor": "PHP8", "orm": "Full", "platform": "FPM/FastCGI", "webserver": "nginx", @@ -37,13 +37,13 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", - "flavor": "None", + "flavor": "PHP8", "orm": "Full", "platform": "swoole", "webserver": "none", "os": "Linux", "database_os": "Linux", - "display_name": "laravel-swoole", + "display_name": "laravel [octane,swoole]", "notes": "", "versus": "swoole" }, @@ -60,13 +60,13 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", - "flavor": "None", + "flavor": "PHP8", "orm": "Full", "platform": "swoole", "webserver": "none", "os": "Linux", "database_os": "Linux", - "display_name": "laravel-laravel-s", + "display_name": "laravel [laravel-s]", "notes": "", "versus": "swoole" }, @@ -83,13 +83,13 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", - "flavor": "None", + "flavor": "PHP8", "orm": "Full", "platform": "roadrunner", "webserver": "none", "os": "Linux", "database_os": "Linux", - "display_name": "laravel-roadrunner", + "display_name": "laravel [roadrunner]", "notes": "", "versus": "swoole" }, @@ -106,13 +106,13 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", - "flavor": "PHP8.1", + "flavor": "PHP8", "orm": "Full", "platform": "workerman", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "laravel-workerman", + "display_name": "laravel [workerman]", "notes": "", "versus": "php" }, @@ -129,13 +129,13 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", - "flavor": "None", + "flavor": "PHP8", "orm": "Full", "platform": "Frankenphp", "webserver": "caddy", "os": "Linux", "database_os": "Linux", - "display_name": "laravel-octane [frankenphp]", + "display_name": "laravel [octane,frankenphp]", "notes": "", "versus": "php" }, @@ -152,13 +152,13 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", - "flavor": "PHP8.3", + "flavor": "PHP8", "orm": "Full", "platform": "Ripple", "webserver": "PServer", "os": "Linux", "database_os": "Linux", - "display_name": "laravel-ripple", + "display_name": "laravel [ripple]", "notes": "", "versus": "php", "tags": ["broken"] diff --git a/frameworks/PHP/laravel/deploy/swoole/composer.json b/frameworks/PHP/laravel/deploy/swoole/composer.json deleted file mode 100644 index 8293ab06f70..00000000000 --- a/frameworks/PHP/laravel/deploy/swoole/composer.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "laravel/laravel", - "type": "project", - "description": "The Laravel Framework.", - "keywords": [ - "framework", - "laravel" - ], - "license": "MIT", - "require": { - "laravel/framework": "^9", - "swooletw/laravel-swoole": "^v2.6" - }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true - }, - "extra": { - "laravel": { - "dont-discover": [] - } - }, - "autoload": { - "psr-4": { - "App\\": "app/" - } - }, - "minimum-stability": "dev", - "prefer-stable": true, - "scripts": { - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover --ansi" - ], - "post-root-package-install": [ - "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" - ], - "post-create-project-cmd": [ - "@php artisan key:generate --ansi" - ] - } -} diff --git a/frameworks/PHP/laravel/laravel-swoole.dockerfile b/frameworks/PHP/laravel/laravel-swoole.dockerfile index d8d9881c82f..de27380656d 100644 --- a/frameworks/PHP/laravel/laravel-swoole.dockerfile +++ b/frameworks/PHP/laravel/laravel-swoole.dockerfile @@ -15,13 +15,10 @@ RUN mkdir -p bootstrap/cache \ storage/framework/views \ storage/framework/cache -COPY --link deploy/swoole/composer.json . - -RUN echo "APP_SWOOLE=true" >> .env - -RUN composer install -a --no-dev --quiet +RUN composer require laravel/octane:2.11 --update-no-dev --no-scripts --quiet +RUN php artisan octane:install --server="swoole" RUN php artisan optimize EXPOSE 8080 -ENTRYPOINT [ "php", "artisan", "swoole:http", "start" ] +ENTRYPOINT ["php", "artisan", "octane:swoole", "--host=0.0.0.0", "--port=8080", "--workers=auto", "--task-workers=auto", "--max-requests=10000"]