diff --git a/presets/laravel+octane/config.yml b/presets/laravel+octane/config.yml index c0a51b33..107b23b2 100644 --- a/presets/laravel+octane/config.yml +++ b/presets/laravel+octane/config.yml @@ -13,14 +13,13 @@ create: - name: 'Swoole' actions: - scripts: - - docker pull -q kooldev/php:8.1-nginx - - docker pull -q kooldev/php:8.1-nginx-swoole - - kool docker kooldev/php:8.1-nginx-swoole composer create-project --no-install --no-scripts --prefer-dist laravel/laravel $CREATE_DIRECTORY + - docker pull -q kooldev/php:8.2-swoole + - kool docker kooldev/php:8.2-swoole composer create-project --no-install --no-scripts --prefer-dist laravel/laravel $CREATE_DIRECTORY - name: 'RoadRunner' actions: - scripts: - - docker pull -q kooldev/php:8.1-nginx - - kool docker kooldev/php:8.1-nginx composer create-project --no-install --no-scripts --prefer-dist laravel/laravel $CREATE_DIRECTORY + - docker pull -q kooldev/php:8.2-node + - kool docker kooldev/php:8.2-node composer create-project --no-install --no-scripts --prefer-dist laravel/laravel $CREATE_DIRECTORY # Preset defines the workflow for installing this preset in the current working directory preset: @@ -40,15 +39,20 @@ preset: actions: - merge: scripts/laravel+octane+swoole.yml dst: kool.yml - - recipe: php-8.1-swoole + - recipe: php-8.2-swoole - name: 'RoadRunner' actions: - merge: scripts/laravel+octane+roadrunner.yml dst: kool.yml - - recipe: php-8.1-roadrunner + - recipe: php-8.2-roadrunner - - name: 'Customize Database, Cache and Node Package Manager' + - name: 'Use NPM and install dependencies' + actions: + - recipe: npm-laravel + - scripts: + - kool run npm install --save-dev chokidar + + - name: 'Customize Database and Cache' actions: - recipe: pick-db - recipe: pick-cache - - recipe: pick-laravel-node diff --git a/recipes/php-8.1-roadrunner.yml b/recipes/php-8.1-roadrunner.yml deleted file mode 100644 index b0568e87..00000000 --- a/recipes/php-8.1-roadrunner.yml +++ /dev/null @@ -1,8 +0,0 @@ -title: "PHP 8.1 + RoadRunner" - -actions: - - merge: app/php81-roadrunner.yml - dst: docker-compose.yml - - scripts: - - kool docker kooldev/php:8.1-nginx composer require laravel/octane spiral/roadrunner spiral/roadrunner-http spiral/roadrunner-cli - - kool docker kooldev/php:8.1-nginx php artisan octane:install --server=roadrunner --no-interaction diff --git a/recipes/php-8.1-swoole.yml b/recipes/php-8.1-swoole.yml deleted file mode 100644 index 4b65dcf9..00000000 --- a/recipes/php-8.1-swoole.yml +++ /dev/null @@ -1,8 +0,0 @@ -title: "PHP 8.1 + Swoole" - -actions: - - merge: app/php81-swoole.yml - dst: docker-compose.yml - - scripts: - - kool docker kooldev/php:8.1-nginx-swoole composer require laravel/octane - - kool docker kooldev/php:8.1-nginx-swoole php artisan octane:install --server=swoole diff --git a/recipes/php-8.2-roadrunner.yml b/recipes/php-8.2-roadrunner.yml new file mode 100644 index 00000000..9084e3f4 --- /dev/null +++ b/recipes/php-8.2-roadrunner.yml @@ -0,0 +1,8 @@ +title: "PHP 8.2 + RoadRunner" + +actions: + - merge: app/php82-roadrunner.yml + dst: docker-compose.yml + - scripts: + - kool docker kooldev/php:8.2-node composer require laravel/octane spiral/roadrunner spiral/roadrunner-http spiral/roadrunner-cli + - kool docker kooldev/php:8.2-node php artisan octane:install --server=roadrunner --no-interaction diff --git a/recipes/php-8.2-swoole.yml b/recipes/php-8.2-swoole.yml new file mode 100644 index 00000000..4e626b8b --- /dev/null +++ b/recipes/php-8.2-swoole.yml @@ -0,0 +1,8 @@ +title: "PHP 8.2 + Swoole" + +actions: + - merge: app/php82-swoole.yml + dst: docker-compose.yml + - scripts: + - kool docker kooldev/php:8.2-swoole composer require laravel/octane + - kool docker kooldev/php:8.2-swoole php artisan octane:install --server=swoole diff --git a/templates/app/php81-roadrunner.yml b/templates/app/php82-roadrunner.yml similarity index 78% rename from templates/app/php81-roadrunner.yml rename to templates/app/php82-roadrunner.yml index 1772b39f..02243ef8 100644 --- a/templates/app/php81-roadrunner.yml +++ b/templates/app/php82-roadrunner.yml @@ -1,7 +1,7 @@ services: app: - image: kooldev/php:8.1-nginx - command: php artisan octane:start --server=roadrunner --host=0.0.0.0 --rpc-port=6001 --port=80 + image: kooldev/php:8.2-node + command: php artisan octane:start --server=roadrunner --host=0.0.0.0 --rpc-port=6001 --port=80 --watch --poll ports: - "${KOOL_APP_PORT:-80}:80" environment: diff --git a/templates/app/php81-swoole.yml b/templates/app/php82-swoole.yml similarity index 81% rename from templates/app/php81-swoole.yml rename to templates/app/php82-swoole.yml index b171abfb..f6a7cd56 100644 --- a/templates/app/php81-swoole.yml +++ b/templates/app/php82-swoole.yml @@ -1,7 +1,7 @@ services: app: - image: kooldev/php:8.1-nginx-swoole - command: php artisan octane:start --server=swoole --host=0.0.0.0 --port=80 + image: kooldev/php:8.2-swoole + command: php artisan octane:start --server=swoole --host=0.0.0.0 --port=80 --watch --poll ports: - "${KOOL_APP_PORT:-80}:80" environment: diff --git a/templates/scripts/laravel+octane+roadrunner.yml b/templates/scripts/laravel+octane+roadrunner.yml index 00a8e51e..1e6c0f2b 100644 --- a/templates/scripts/laravel+octane+roadrunner.yml +++ b/templates/scripts/laravel+octane+roadrunner.yml @@ -13,5 +13,5 @@ scripts: before-start: - kool docker kooldev/bash -c "cp .env.example .env" - - kool docker kooldev/php:8.1-nginx composer install - - kool docker kooldev/php:8.1-nginx php artisan key:generate + - kool docker kooldev/php:8.2-node composer install + - kool docker kooldev/php:8.2-node php artisan key:generate diff --git a/templates/scripts/laravel+octane+swoole.yml b/templates/scripts/laravel+octane+swoole.yml index 88bbbbe2..46eaba98 100644 --- a/templates/scripts/laravel+octane+swoole.yml +++ b/templates/scripts/laravel+octane+swoole.yml @@ -13,5 +13,5 @@ scripts: before-start: - kool docker kooldev/bash -c "cp .env.example .env" - - kool docker kooldev/php:8.1-nginx-swoole composer install - - kool docker kooldev/php:8.1-nginx-swoole php artisan key:generate + - kool docker kooldev/php:8.2-swoole composer install + - kool docker kooldev/php:8.2-swoole php artisan key:generate