From 101db6c4fb74e6f63974f2059227d2ea374f1f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Ioni=C8=9B=C4=83?= <hi@andrei.io>
Date: Tue, 17 Mar 2026 15:48:43 +0000
Subject: [PATCH] refactor: extract queue work to separate script

---
 8.4/Dockerfile                          | 1 +
 common/etc/s6-overlay/s6-rc.d/queue/run | 8 +-------
 common/usr/local/bin/queue-work         | 9 +++++++++
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 common/usr/local/bin/queue-work

diff --git a/8.4/Dockerfile b/8.4/Dockerfile
index 7c3698c..5a5a752 100644
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@@ -3,6 +3,7 @@ FROM serversideup/php:8.4-fpm-nginx-alpine
 COPY --chmod=755 common/etc/entrypoint.d /etc/entrypoint.d
 COPY --chmod=755 common/etc/s6-overlay /etc/s6-overlay
 COPY --chmod=755 --chown=www-data:www-data common/etc/nginx /etc/nginx
+COPY --chmod=755 common/usr/local/bin /usr/local/bin
 
 # PHP limits
 ENV PHP_MEMORY_LIMIT=256M
diff --git a/common/etc/s6-overlay/s6-rc.d/queue/run b/common/etc/s6-overlay/s6-rc.d/queue/run
index ebab12c..5b16bd5 100644
--- a/common/etc/s6-overlay/s6-rc.d/queue/run
+++ b/common/etc/s6-overlay/s6-rc.d/queue/run
@@ -2,13 +2,7 @@
 
 if [ "$QUEUE_ENABLED" = "true" ]; then
     echo "✅ Queue is enabled"
-    php "$APP_BASE_DIR/artisan" queue:work \
-        --max-jobs $QUEUE_MAX_JOBS \
-        --sleep $QUEUE_SLEEP \
-        --rest $QUEUE_REST \
-        --timeout $QUEUE_TIMEOUT \
-        --tries $QUEUE_TRIES \
-        --force
+    queue-work
 else
     echo "❌ Queue is disabled"
     s6-svc -Od .
diff --git a/common/usr/local/bin/queue-work b/common/usr/local/bin/queue-work
new file mode 100644
index 0000000..46a83e5
--- /dev/null
+++ b/common/usr/local/bin/queue-work
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+artisan queue:work \
+    --max-jobs $QUEUE_MAX_JOBS \
+    --sleep $QUEUE_SLEEP \
+    --rest $QUEUE_REST \
+    --timeout $QUEUE_TIMEOUT \
+    --tries $QUEUE_TRIES \
+    --force