Merge branch 'next' into new-dockerfiles

docker/dev/etc/s6-overlay/s6-rc.d/horizon/run

@@ -1,5 +1,5 @@
 #!/command/execlineb -P
 foreground {
   s6-sleep 5
-  su - www-data -c "php /var/www/html/artisan start:horizon"
+  su - webuser -c "php /var/www/html/artisan start:horizon"
 }

docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run

@@ -1,5 +1,5 @@
 #!/command/execlineb -P
 foreground {
   s6-sleep 5
-  su - www-data -c "php /var/www/html/artisan start:scheduler"
+  su - webuser -c "php /var/www/html/artisan start:scheduler"
 }

docker/prod/etc/s6-overlay/s6-rc.d/horizon/run

@@ -1,5 +1,5 @@
 #!/command/execlineb -P
 foreground {
   s6-sleep 5
-  su - www-data -c "php /var/www/html/artisan start:horizon"
+  su - webuser -c "php /var/www/html/artisan start:horizon"
 }

docker/prod/etc/s6-overlay/s6-rc.d/init-script/up

@@ -1,3 +1,3 @@
 #!/command/execlineb -P
-s6-setuidgid www-data
+s6-setuidgid webuser
 php /var/www/html/artisan app:init

docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run

@@ -1,5 +1,5 @@
 #!/command/execlineb -P
 foreground {
   s6-sleep 5
-  su - www-data -c "php /var/www/html/artisan start:scheduler"
+  su - webuser -c "php /var/www/html/artisan start:scheduler"
 }