wip

exaco · Jan 25, 2024 · aec162a · aec162a
1 parent c5646fa
commit aec162a
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -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

diff --git a/FrankenPHP.Dockerfile b/FrankenPHP.Dockerfile
@@ -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} \

diff --git a/deployment/octane/FrankenPHP/supervisord.frankenphp.conf b/deployment/octane/FrankenPHP/supervisord.frankenphp.conf
@@ -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
@@ -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]
@@ -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
diff --git a/deployment/octane/RoadRunner/supervisord.roadrunner.conf b/deployment/octane/RoadRunner/supervisord.roadrunner.conf
@@ -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
@@ -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]
@@ -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
diff --git a/deployment/octane/Swoole/supervisord.swoole.conf b/deployment/octane/Swoole/supervisord.swoole.conf
@@ -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
@@ -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]
@@ -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
diff --git a/deployment/supervisord.horizon.conf b/deployment/supervisord.horizon.conf
@@ -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

diff --git a/deployment/supervisord.scheduler.conf b/deployment/supervisord.scheduler.conf
@@ -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