From a399f41f81fe5f22132d3f41436f119e1b1a25e3 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:54:00 +0100 Subject: [PATCH] switch user --- docker/dev/etc/s6-overlay/s6-rc.d/horizon/run | 2 +- docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run | 2 +- docker/prod/etc/s6-overlay/s6-rc.d/horizon/run | 2 +- docker/prod/etc/s6-overlay/s6-rc.d/init-script/up | 2 +- docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run | 2 +- scripts/run | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/dev/etc/s6-overlay/s6-rc.d/horizon/run b/docker/dev/etc/s6-overlay/s6-rc.d/horizon/run index 87471097e..a67e6bbd1 100644 --- a/docker/dev/etc/s6-overlay/s6-rc.d/horizon/run +++ b/docker/dev/etc/s6-overlay/s6-rc.d/horizon/run @@ -1,5 +1,5 @@ #!/command/execlineb -P foreground { s6-sleep 5 - su - webuser -c "php /var/www/html/artisan start:horizon" + su - www-data -c "php /var/www/html/artisan start:horizon" } diff --git a/docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run b/docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run index 87ca0cae1..bd371a5a5 100644 --- a/docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run +++ b/docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run @@ -1,5 +1,5 @@ #!/command/execlineb -P foreground { s6-sleep 5 - su - webuser -c "php /var/www/html/artisan start:scheduler" + su - www-data -c "php /var/www/html/artisan start:scheduler" } diff --git a/docker/prod/etc/s6-overlay/s6-rc.d/horizon/run b/docker/prod/etc/s6-overlay/s6-rc.d/horizon/run index 87471097e..a67e6bbd1 100644 --- a/docker/prod/etc/s6-overlay/s6-rc.d/horizon/run +++ b/docker/prod/etc/s6-overlay/s6-rc.d/horizon/run @@ -1,5 +1,5 @@ #!/command/execlineb -P foreground { s6-sleep 5 - su - webuser -c "php /var/www/html/artisan start:horizon" + su - www-data -c "php /var/www/html/artisan start:horizon" } diff --git a/docker/prod/etc/s6-overlay/s6-rc.d/init-script/up b/docker/prod/etc/s6-overlay/s6-rc.d/init-script/up index 3b252b782..3d8c4cfa8 100644 --- a/docker/prod/etc/s6-overlay/s6-rc.d/init-script/up +++ b/docker/prod/etc/s6-overlay/s6-rc.d/init-script/up @@ -1,3 +1,3 @@ #!/command/execlineb -P -s6-setuidgid webuser +s6-setuidgid www-data php /var/www/html/artisan app:init diff --git a/docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run b/docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run index 87ca0cae1..bd371a5a5 100644 --- a/docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run +++ b/docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run @@ -1,5 +1,5 @@ #!/command/execlineb -P foreground { s6-sleep 5 - su - webuser -c "php /var/www/html/artisan start:scheduler" + su - www-data -c "php /var/www/html/artisan start:scheduler" } diff --git a/scripts/run b/scripts/run index 9d3c4f1f4..ceab9f4d7 100755 --- a/scripts/run +++ b/scripts/run @@ -32,14 +32,14 @@ function sync:bunny { } function db:reset { - bash spin exec -u webuser coolify php artisan migrate:fresh --seed + bash spin exec -u www-data coolify php artisan migrate:fresh --seed } function db:reset-prod { - bash spin exec -u webuser coolify php artisan migrate:fresh --force --seed --seeder=ProductionSeeder || + bash spin exec -u www-data coolify php artisan migrate:fresh --force --seed --seeder=ProductionSeeder || php artisan migrate:fresh --force --seed --seeder=ProductionSeeder } function coolify { - bash spin exec -u webuser coolify bash + bash spin exec -u www-data coolify bash } function coolify:root { @@ -58,7 +58,7 @@ function vite { } function tinker { - bash spin exec -u webuser coolify php artisan tinker + bash spin exec -u www-data coolify php artisan tinker } function default {