mirror of
https://github.com/sp-tarkov/forge.git
synced 2025-02-12 12:10:41 -05:00
Octane Changes
Updates Octane to use swoole as a runner. FrankenPHP was having issues with the INTL PHP extension. Also updates the development site to load over HTTP instead of HTTPS. No need for encryption for basic local development.
This commit is contained in:
parent
cb636fd197
commit
a895210cef
@ -6,7 +6,7 @@ APP_KEY=
|
||||
|
||||
APP_DEBUG=true
|
||||
APP_TIMEZONE=UTC
|
||||
APP_URL=https://localhost
|
||||
APP_URL=http://localhost
|
||||
APP_LOCALE=en
|
||||
APP_FALLBACK_LOCALE=en
|
||||
APP_FAKER_LOCALE=en_US
|
||||
@ -82,7 +82,7 @@ MAIL_ENCRYPTION=null
|
||||
MAIL_FROM_ADDRESS="no-reply@sp-tarkov.com"
|
||||
MAIL_FROM_NAME="${APP_NAME}"
|
||||
|
||||
OCTANE_SERVER=frankenphp
|
||||
OCTANE_HTTPS=true
|
||||
OCTANE_SERVER=swoole
|
||||
OCTANE_HTTPS=false
|
||||
|
||||
SAIL_XDEBUG_MODE=develop,debug,coverage
|
||||
|
6
.github/README.md
vendored
6
.github/README.md
vendored
@ -27,9 +27,9 @@ We use [Laravel Sail](https://laravel.com/docs/11.x/sail) to mirror the services
|
||||
|
||||
| Service | Authentication | Access Via Host |
|
||||
|----------------------------------|----------------|-----------------------------|
|
||||
| Laravel Filament Admin Panel | Via User Role | <https://localhost/admin> |
|
||||
| Redis Queue Management (Horizon) | Via User Role | <https://localhost/horizon> |
|
||||
| Website Status (Pulse) | Via User Role | <https://localhost/pulse> |
|
||||
| Laravel Filament Admin Panel | Via User Role | <http://localhost/admin> |
|
||||
| Redis Queue Management (Horizon) | Via User Role | <http://localhost/horizon> |
|
||||
| Website Status (Pulse) | Via User Role | <http://localhost/pulse> |
|
||||
| Meilisearch WebUI | Local Only | <http://localhost:7700> |
|
||||
| Mailpit WebUI | Local Only | <http://localhost:8025> |
|
||||
|
||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -7,6 +7,8 @@
|
||||
/.idea
|
||||
/.phpunit.cache
|
||||
/.vscode
|
||||
/caddy
|
||||
/config/psysh
|
||||
/data
|
||||
/node_modules
|
||||
/public/build
|
||||
@ -21,4 +23,3 @@ Homestead.json
|
||||
Homestead.yaml
|
||||
npm-debug.log
|
||||
yarn-error.log
|
||||
config/psysh
|
||||
|
@ -7,6 +7,7 @@
|
||||
"require": {
|
||||
"php": "^8.3",
|
||||
"ext-curl": "*",
|
||||
"ext-intl": "*",
|
||||
"aws/aws-sdk-php": "^3.314",
|
||||
"filament/filament": "^3.2",
|
||||
"http-interop/http-factory-guzzle": "^1.2",
|
||||
|
@ -12,10 +12,13 @@ use Laravel\Octane\Events\WorkerErrorOccurred;
|
||||
use Laravel\Octane\Events\WorkerStarting;
|
||||
use Laravel\Octane\Events\WorkerStopping;
|
||||
use Laravel\Octane\Listeners\CloseMonologHandlers;
|
||||
use Laravel\Octane\Listeners\CollectGarbage;
|
||||
use Laravel\Octane\Listeners\DisconnectFromDatabases;
|
||||
use Laravel\Octane\Listeners\EnsureUploadedFilesAreValid;
|
||||
use Laravel\Octane\Listeners\EnsureUploadedFilesCanBeMoved;
|
||||
use Laravel\Octane\Listeners\FlushOnce;
|
||||
use Laravel\Octane\Listeners\FlushTemporaryContainerInstances;
|
||||
use Laravel\Octane\Listeners\FlushUploadedFiles;
|
||||
use Laravel\Octane\Listeners\ReportException;
|
||||
use Laravel\Octane\Listeners\StopWorkerIfNecessary;
|
||||
use Laravel\Octane\Octane;
|
||||
@ -35,7 +38,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'server' => env('OCTANE_SERVER', 'frankenphp'),
|
||||
'server' => env('OCTANE_SERVER', 'swoole'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -48,7 +51,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'https' => env('OCTANE_HTTPS', true),
|
||||
'https' => env('OCTANE_HTTPS', false),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -132,7 +135,7 @@ return [
|
||||
],
|
||||
|
||||
'flush' => [
|
||||
//
|
||||
\Barryvdh\Debugbar\LaravelDebugbar::class,
|
||||
],
|
||||
|
||||
/*
|
||||
|
@ -19,9 +19,7 @@ services:
|
||||
XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
|
||||
XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
|
||||
IGNITION_LOCAL_SITES_PATH: '${PWD}'
|
||||
SUPERVISOR_PHP_COMMAND: "/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan octane:start --host=localhost --port=443 --admin-port=2019 --https --watch"
|
||||
XDG_CONFIG_HOME: /var/www/html/config
|
||||
XDG_DATA_HOME: /var/www/html/data
|
||||
SUPERVISOR_PHP_COMMAND: "/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan octane:start --server=swoole --host=0.0.0.0 --port=80 --watch"
|
||||
volumes:
|
||||
- '.:/var/www/html'
|
||||
networks:
|
||||
|
Loading…
x
Reference in New Issue
Block a user