docker: add Laravel scheduler and queue worker services with S6 integration

Author: alexjustesen

Dockerfile

@@ -111,6 +111,9 @@ RUN set -e; \
 RUN install-php-extensions intl \
     && rm -rf /tmp/*
 
+# Copy s6 service definitions for Laravel scheduler and queue worker
+COPY --chmod=755 root /
+
 # Drop back to our unprivileged user
 USER www-data
 

README.md

@@ -2,16 +2,9 @@
 
 > [!INFO]
 > **Work in Progress** - This is a custom Docker image build based on [ServerSideUp's Docker PHP](https://serversideup.net/open-source/docker-php/).
->
-> This image separates the application into multiple services:
-> - **Main App** (PHP/Web server)
-> - **Task Scheduler** (Cron jobs)
-> - **Queue Worker** (Background jobs)
 
 ### Using
 
-This image is designed to work as a service and separates the app from the task scheduler and queue worker into separate service containers.
-
 ```yaml
 # compose.yml
 services:
@@ -33,28 +26,6 @@ services:
             - DB_PASSWORD=
         depends_on:
             - db
-            - task
-            - queue
-
-    task:
-        image: speedtest-tracker-docker:latest
-        command: ["php", "/var/www/html/artisan", "schedule:work"]
-        stop_signal: SIGTERM # Set this for graceful shutdown if you're using fpm-apache or fpm-nginx
-        healthcheck:
-            test: ["CMD", "healthcheck-schedule"]
-            start_period: 10s
-        networks:
-            - speedtest
-
-    queue:
-        image: speedtest-tracker-docker:latest
-        command: ["php", "/var/www/html/artisan", "queue:work", "--tries=3"]
-        stop_signal: SIGTERM # Set this for graceful shutdown if you're using fpm-apache or fpm-nginx
-        healthcheck:
-            test: ["CMD", "healthcheck-queue"]
-            start_period: 10s
-        networks:
-            - speedtest
 
     db:
         image: 'postgres:18-alpine'

root/etc/s6-overlay/s6-rc.d/laravel-queue/dependencies.d/svc-php-fpm

@@ -0,0 +1,7 @@
+#!/command/with-contenv bash
+
+# Change to the application directory
+cd /var/www/html
+
+# Run the Laravel queue worker
+exec s6-setuidgid www-data php artisan queue:work --verbose --sleep=5 --tries=3

root/etc/s6-overlay/s6-rc.d/laravel-queue/run

@@ -0,0 +1 @@
+longrun

root/etc/s6-overlay/s6-rc.d/laravel-queue/type

@@ -0,0 +1,19 @@
+#!/command/with-contenv bash
+
+# Change to the application directory
+cd /var/www/html
+
+# Handle shutdown gracefully
+shutdown() {
+    echo "Received shutdown signal, exiting..."
+    exit 0
+}
+
+trap shutdown SIGTERM SIGINT
+
+# Run the Laravel scheduler every minute
+while true; do
+    s6-setuidgid www-data php artisan schedule:run --verbose --no-interaction
+    sleep 60 &
+    wait $!
+done

root/etc/s6-overlay/s6-rc.d/laravel-scheduler/dependencies.d/svc-php-fpm

@@ -0,0 +1 @@
+longrun