Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor Improvements #58

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ yarn-error.log
_ide_helper_models.php
_ide_helper.php
.php-cs-fixer.cache
.husky
/.vscode
**/.DS_Store
/public/page-cache
Expand Down
1 change: 1 addition & 0 deletions FrankenPHP.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ RUN composer install \
--audit

COPY --chown=${NON_ROOT_USER}:${NON_ROOT_USER} . .
COPY --chown=${NON_ROOT_USER}:${NON_ROOT_USER} --from=build ${ROOT}/public public

RUN mkdir -p \
storage/framework/{sessions,views,cache,testing} \
Expand Down
12 changes: 6 additions & 6 deletions deployment/octane/FrankenPHP/supervisord.frankenphp.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pidfile=/var/run/supervisord.pid

[program:octane]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan octane:start --server=frankenphp --host=0.0.0.0 --port=80 --admin-port=2019
command=php %(ENV_ROOT)s/artisan octane:start --server=frankenphp --host=0.0.0.0 --port=80 --admin-port=2019
user=%(ENV_NON_ROOT_USER)s
autostart=true
autorestart=true
Expand All @@ -18,11 +18,11 @@ stderr_logfile_maxbytes=0

[program:horizon]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan horizon
command=php %(ENV_ROOT)s/artisan horizon
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_HORIZON)s
autorestart=true
stdout_logfile=/var/www/html/horizon.log
stdout_logfile=%(ENV_ROOT)s/horizon.log
stopwaitsecs=3600

[program:scheduler]
Expand All @@ -31,12 +31,12 @@ command=supercronic -overlapping /etc/supercronic/laravel
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_SCHEDULER)s
autorestart=true
stdout_logfile=/var/www/html/scheduler.log
stdout_logfile=%(ENV_ROOT)s/scheduler.log

[program:clear-scheduler-cache]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan schedule:clear-cache
command=php %(ENV_ROOT)s/artisan schedule:clear-cache
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_SCHEDULER)s
autorestart=false
stdout_logfile=/var/www/html/scheduler.log
stdout_logfile=%(ENV_ROOT)s/scheduler.log
12 changes: 6 additions & 6 deletions deployment/octane/RoadRunner/supervisord.roadrunner.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pidfile=/var/run/supervisord.pid

[program:octane]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan octane:start --server=roadrunner --host=0.0.0.0 --port=80 --rpc-port=6001 --rr-config=/var/www/html/.rr.yaml
command=php %(ENV_ROOT)s/artisan octane:start --server=roadrunner --host=0.0.0.0 --port=80 --rpc-port=6001 --rr-config=%(ENV_ROOT)s/.rr.yaml
user=%(ENV_NON_ROOT_USER)s
autostart=true
autorestart=true
Expand All @@ -18,11 +18,11 @@ stderr_logfile_maxbytes=0

[program:horizon]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan horizon
command=php %(ENV_ROOT)s/artisan horizon
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_HORIZON)s
autorestart=true
stdout_logfile=/var/www/html/horizon.log
stdout_logfile=%(ENV_ROOT)s/horizon.log
stopwaitsecs=3600

[program:scheduler]
Expand All @@ -31,12 +31,12 @@ command=supercronic -overlapping /etc/supercronic/laravel
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_SCHEDULER)s
autorestart=true
stdout_logfile=/var/www/html/scheduler.log
stdout_logfile=%(ENV_ROOT)s/scheduler.log

[program:clear-scheduler-cache]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan schedule:clear-cache
command=php %(ENV_ROOT)s/artisan schedule:clear-cache
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_SCHEDULER)s
autorestart=false
stdout_logfile=/var/www/html/scheduler.log
stdout_logfile=%(ENV_ROOT)s/scheduler.log
12 changes: 6 additions & 6 deletions deployment/octane/Swoole/supervisord.swoole.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pidfile=/var/run/supervisord.pid

[program:octane]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan octane:start --server=swoole --host=0.0.0.0 --port=80
command=php %(ENV_ROOT)s/artisan octane:start --server=swoole --host=0.0.0.0 --port=80
user=%(ENV_NON_ROOT_USER)s
autostart=true
autorestart=true
Expand All @@ -18,11 +18,11 @@ stderr_logfile_maxbytes=0

[program:horizon]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan horizon
command=php %(ENV_ROOT)s/artisan horizon
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_HORIZON)s
autorestart=true
stdout_logfile=/var/www/html/horizon.log
stdout_logfile=%(ENV_ROOT)s/horizon.log
stopwaitsecs=3600

[program:scheduler]
Expand All @@ -31,12 +31,12 @@ command=supercronic -overlapping /etc/supercronic/laravel
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_SCHEDULER)s
autorestart=true
stdout_logfile=/var/www/html/scheduler.log
stdout_logfile=%(ENV_ROOT)s/scheduler.log

[program:clear-scheduler-cache]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan schedule:clear-cache
command=php %(ENV_ROOT)s/artisan schedule:clear-cache
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_SCHEDULER)s
autorestart=false
stdout_logfile=/var/www/html/scheduler.log
stdout_logfile=%(ENV_ROOT)s/scheduler.log
2 changes: 1 addition & 1 deletion deployment/supervisord.horizon.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pidfile=/var/run/supervisord.pid

[program:horizon]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan horizon
command=php %(ENV_ROOT)s/artisan horizon
user=%(ENV_NON_ROOT_USER)s
autostart=true
autorestart=true
Expand Down
2 changes: 1 addition & 1 deletion deployment/supervisord.scheduler.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stderr_logfile_maxbytes=0

[program:clear-scheduler-cache]
process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan schedule:clear-cache
command=php %(ENV_ROOT)s/artisan schedule:clear-cache
user=%(ENV_NON_ROOT_USER)s
autostart=%(ENV_WITH_SCHEDULER)s
autorestart=false
Expand Down
Loading