Merge remote-tracking branch 'origin/next' into feat/railpack

docker/coolify-helper/Dockerfile

@@ -34,7 +34,8 @@ ARG MISE_VERSION
 
 USER root
 WORKDIR /artifacts
-RUN apk add --no-cache bash curl git git-lfs openssh-client tar tini
+RUN apk upgrade --no-cache && \
+    apk add --no-cache bash curl git git-lfs openssh-client tar tini
 RUN mkdir -p ~/.docker/cli-plugins
 
 # Install mise (musl build) at the path railpack expects (/tmp/railpack/mise/mise-VERSION).

docker/coolify-realtime/Dockerfile

@@ -10,7 +10,8 @@ ARG TARGETPLATFORM
 ARG CLOUDFLARED_VERSION
 
 WORKDIR /terminal
-RUN apk add --no-cache openssh-client make g++ python3 curl
+RUN apk upgrade --no-cache && \
+    apk add --no-cache openssh-client make g++ python3 curl
 COPY docker/coolify-realtime/package.json ./
 RUN npm i
 RUN npm rebuild node-pty --update-binary

docker/development/Dockerfile

@@ -33,7 +33,8 @@ RUN docker-php-serversideup-set-id www-data $USER_ID:$GROUP_ID && \
     docker-php-serversideup-set-file-permissions --owner $USER_ID:$GROUP_ID --service nginx
 
 # Install PostgreSQL repository and keys
-RUN apk add --no-cache gnupg && \
+RUN apk upgrade --no-cache && \
+    apk add --no-cache gnupg && \
     mkdir -p /usr/share/keyrings && \
     curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg
 

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

@@ -1,12 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
 
-foreground {
-    php
-    artisan
-    start:horizon
-}
+if grep -qE '^HORIZON_ENABLED=false' .env 2>/dev/null; then
+    echo "   INFO  Horizon is disabled, sleeping."
+    exec sleep infinity
+fi
 
+echo "   INFO  Horizon is enabled, starting..."
+exec php artisan horizon

docker/development/etc/s6-overlay/s6-rc.d/nightwatch-agent/run

@@ -1,12 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
 
-foreground {
-    php
-    artisan
-    start:nightwatch
-}
+if grep -qE '^NIGHTWATCH_ENABLED=true' .env 2>/dev/null; then
+    echo "   INFO  Nightwatch is enabled, starting..."
+    exec php artisan nightwatch:agent
+fi
 
+echo "   INFO  Nightwatch is disabled, sleeping."
+exec sleep infinity

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

@@ -1,13 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
 
-foreground {
-    php
-    artisan
-    start:scheduler
-}
-
+if grep -qE '^SCHEDULER_ENABLED=false' .env 2>/dev/null; then
+    echo "   INFO  Scheduler is disabled, sleeping."
+    exec sleep infinity
+fi
 
+echo "   INFO  Scheduler is enabled, starting..."
+exec php artisan schedule:work

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

@@ -1,11 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
-foreground {
-    php
-    artisan
-    start:horizon
-}
 
+if grep -qE '^HORIZON_ENABLED=false' .env 2>/dev/null; then
+    echo "   INFO  Horizon is disabled, sleeping."
+    exec sleep infinity
+fi
+
+echo "   INFO  Horizon is enabled, starting..."
+exec php artisan horizon

docker/production/etc/s6-overlay/s6-rc.d/nightwatch-agent/run

@@ -1,11 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
-foreground {
-    php
-    artisan
-    start:nightwatch
-}
 
+if grep -qE '^NIGHTWATCH_ENABLED=true' .env 2>/dev/null; then
+    echo "   INFO  Nightwatch is enabled, starting..."
+    exec php artisan nightwatch:agent
+fi
+
+echo "   INFO  Nightwatch is disabled, sleeping."
+exec sleep infinity

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

@@ -1,10 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
-foreground {
-    php
-    artisan
-    start:scheduler
-}
+
+if grep -qE '^SCHEDULER_ENABLED=false' .env 2>/dev/null; then
+    echo "   INFO  Scheduler is disabled, sleeping."
+    exec sleep infinity
+fi
+
+echo "   INFO  Scheduler is enabled, starting..."
+exec php artisan schedule:work