Skip to content

Commit

Permalink
Merge pull request #1757 from bakaphp/feat-octane-frankenphp
Browse files Browse the repository at this point in the history
Feat octane frankenphp
  • Loading branch information
rwhite27 committed Aug 1, 2024
2 parents b737bd5 + 274b718 commit 5412ca6
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 186 deletions.
11 changes: 1 addition & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ DB_CRM_PASSWORD=password

## Running the project with Laravel Octane

After doing all the steps above, you could run the project with Laravel Octane by using the command ```php artisan octane:start --port 8080 --host=0.0.0.0```.
After doing all the steps above, you could run the project with Laravel Octane by using the command ```php artisan octane:start --server=swoole --host=0.0.0.0 --port=8000```.

Use `--watch` in development allowing you to refresh modified files, this works assuming to have `npm install chokidar` installed in the project.
****
Expand All @@ -116,12 +116,3 @@ Note:
- To install Swoole you can use the command ```pecl install swoole```
- For production remove `--watch` from the command.
- roles_kanvas_legacy will be deleted in the future.


## Feature Labs

### Run the project using FrankenPHP

``` sh
docker compose -f docker-compose.franken.yml up -d --build
```
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"spatie/laravel-queueable-action": "^2.15",
"spatie/laravel-webhook-server": "^3.8",
"stripe/stripe-php": "^15.0",
"swoole/ide-helper": "*",
"symfony/expression-language": "^7.0",
"symfony/http-client": "^7.0",
"symfony/mailgun-mailer": "^7.0",
Expand Down
34 changes: 33 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

132 changes: 0 additions & 132 deletions docker-compose.franken.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docker/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ server {
return 204;
}

proxy_pass http://php:8080;
proxy_pass http://php:8000;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
Expand Down
42 changes: 0 additions & 42 deletions franken.Dockerfile

This file was deleted.

0 comments on commit 5412ca6

Please sign in to comment.