Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/next' into reverb-realtime-migration

Andras Bacsaie3ff6bef073a
diff --cc app/Actions/Server/CleanupDocker.php
index 919feb6904,04fe00ad48..9f58fd4f88
--- a/app/Actions/Server/CleanupDocker.php
+++ b/app/Actions/Server/CleanupDocker.php
@@@ -44,9 -54,11 +47,9 @@@ class CleanupDocke
'docker container prune -f --filter "label=coolify.managed=true" --filter "label!=coolify.proxy=true" --filter "label!=coolify.type=database" --filter "label!=coolify.type=application" --filter "label!=coolify.type=service"',
$imagePruneCmd,
'docker builder prune -af',
- "docker run --rm -v \$HOME/.docker/buildx:/root/.docker/buildx -v /var/run/docker.sock:/var/run/docker.sock {$helperImageWithVersion} docker buildx prune --builder coolify-railpack -af 2>/dev/null || true",
+ "docker run --rm -v {$buildxMetadataVolume}:/root/.docker/buildx -v /var/run/docker.sock:/var/run/docker.sock {$helperImageWithVersion} docker buildx prune --builder coolify-railpack -af 2>/dev/null || true",
"docker images --filter before=$helperImageWithVersion --filter reference=$helperImage | grep $helperImage | awk '{print $3}' | xargs -r docker rmi -f",
- "docker images --filter before=$realtimeImageWithVersion --filter reference=$realtimeImage | grep $realtimeImage | awk '{print $3}' | xargs -r docker rmi -f",
"docker images --filter before=$helperImageWithoutPrefixVersion --filter reference=$helperImageWithoutPrefix | grep $helperImageWithoutPrefix | awk '{print $3}' | xargs -r docker rmi -f",
- "docker images --filter before=$realtimeImageWithoutPrefixVersion --filter reference=$realtimeImageWithoutPrefix | grep $realtimeImageWithoutPrefix | awk '{print $3}' | xargs -r docker rmi -f",
];
if ($deleteUnusedVolumes) {
diff --cc app/Models/Server.php
index 12ce7c1475,f7a4bf20c0..9736406428
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@@ -786,16 -790,15 +807,18 @@@ class Server extends BaseMode
$url = Url::fromString($settings->fqdn);
$host = $url->getHost();
$schema = $url->getScheme();
+ $siteAddress = $this->dashboardCaddySiteAddress($settings, $schema, $host);
$caddy_file = "
- $schema://$host {
+ $siteAddress {
+ encode zstd gzip
handle /app/* {
- reverse_proxy coolify-realtime:6001
+ reverse_proxy coolify:6001
+ }
+ handle /apps* {
+ reverse_proxy coolify:6001
}
handle /terminal/ws {
- reverse_proxy coolify-realtime:6002
+ reverse_proxy coolify:6002
}
reverse_proxy coolify:8080
}";
diff --cc composer.json
index 8988c2da5d,18e125510d..65d6d39fbf
--- a/composer.json
+++ b/composer.json
@@@ -11,37 -11,37 +11,38 @@@
"server"
],
"require": {
-- "php": "^8.4",
- "danharrin/livewire-rate-limiting": "^2.1.0",
- "doctrine/dbal": "^4.4.1",
- "guzzlehttp/guzzle": "^7.10.0",
- "laravel/fortify": "^1.34.0",
- "laravel/framework": "^12.49.0",
- "laravel/horizon": "^5.43.0",
+ "danharrin/livewire-rate-limiting": "^2.2.1",
+ "doctrine/dbal": "^4.4.4",
+ "firebase/php-jwt": "7.1.0",
+ "guzzlehttp/guzzle": "^7.15.3",
+ "laravel/fortify": "^1.37.3",
+ "laravel/framework": "^12.65.0",
+ "laravel/horizon": "^5.48.2",
"laravel/mcp": "^0.6.7",
- "laravel/nightwatch": "^1.24",
- "laravel/pail": "^1.2.4",
- "laravel/prompts": "^0.3.11|^0.3.11|^0.3.11",
+ "laravel/nightwatch": "^1.28.6",
+ "laravel/pail": "^1.2.7",
+ "laravel/prompts": "^0.3.22|^0.3.22|^0.3.22",
+ "laravel/reverb": "^1.10",
- "laravel/sanctum": "^4.3.0",
- "laravel/socialite": "^5.24.2",
- "laravel/tinker": "^2.11.0",
- "laravel/ui": "^4.6.1",
+ "laravel/sanctum": "^4.3.3",
+ "laravel/socialite": "^5.29.0",
+ "laravel/tinker": "^2.11.1",
+ "laravel/ui": "^4.6.3",
"lcobucci/jwt": "^5.6.0",
- "league/flysystem-aws-s3-v3": "^3.31.0",
- "league/flysystem-sftp-v3": "^3.31",
- "livewire/livewire": "^3.7.8",
+ "league/flysystem-aws-s3-v3": "^3.35.2",
+ "league/flysystem-sftp-v3": "^3.33",
+ "livewire/livewire": "^3.8.3",
"log1x/laravel-webfonts": "^2.0.1",
- "lorisleiva/laravel-actions": "^2.9.1",
+ "lorisleiva/laravel-actions": "^2.10.2",
"nubs/random-name-generator": "^2.2",
- "phpseclib/phpseclib": "^3.0.49",
- "pion/laravel-chunk-upload": "^1.5.6",
- "poliander/cron": "^3.3.0",
++ "php": "^8.4",
+ "phpseclib/phpseclib": "^3.0.56",
+ "pion/laravel-chunk-upload": "^1.6.1",
+ "poliander/cron": "^3.3.1",
"purplepixie/phpdns": "^2.3.6",
- "pusher/pusher-php-server": "^7.2.7",
+ "pusher/pusher-php-server": "^7.3.0",
"resend/resend-laravel": "^0.20.0",
- "sentry/sentry-laravel": "^4.20.1",
- "socialiteproviders/authentik": "^5.2",
+ "sentry/sentry-laravel": "^4.27.0",
+ "socialiteproviders/authentik": "^5.3",
"socialiteproviders/clerk": "^5.1",
"socialiteproviders/discord": "^4.2",
"socialiteproviders/google": "^4.1",
diff --cc composer.lock
index c813decd5b,18c5260f32..18a1bf9b90
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "22d4e844dfe10e14fd2be3571181ca99",
- "content-hash": "2d511da9e5e82eade5aa7e5094c888ae",
++ "content-hash": "3a54b3e333f74090e8222240cf6db305",
"packages": [
{
"name": "aws/aws-crt-php",
@@@ -341,139 -341,9 +341,139 @@@
],
"time": "2024-02-09T16:56:22+00:00"
},
+ {
+ "name": "clue/redis-protocol",
+ "version": "v0.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/clue/redis-protocol.git",
+ "reference": "6f565332f5531b7722d1e9c445314b91862f6d6c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/clue/redis-protocol/zipball/6f565332f5531b7722d1e9c445314b91862f6d6c",
+ "reference": "6f565332f5531b7722d1e9c445314b91862f6d6c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Clue\\Redis\\Protocol\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "A streaming Redis protocol (RESP) parser and serializer written in pure PHP.",
+ "homepage": "https://github.com/clue/redis-protocol",
+ "keywords": [
+ "parser",
+ "protocol",
+ "redis",
+ "resp",
+ "serializer",
+ "streaming"
+ ],
+ "support": {
+ "issues": "https://github.com/clue/redis-protocol/issues",
+ "source": "https://github.com/clue/redis-protocol/tree/v0.3.2"
+ },
+ "funding": [
+ {
+ "url": "https://clue.engineering/support",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/clue",
+ "type": "github"
+ }
+ ],
+ "time": "2024-08-07T11:06:28+00:00"
+ },
+ {
+ "name": "clue/redis-react",
+ "version": "v2.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/clue/reactphp-redis.git",
+ "reference": "84569198dfd5564977d2ae6a32de4beb5a24bdca"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/clue/reactphp-redis/zipball/84569198dfd5564977d2ae6a32de4beb5a24bdca",
+ "reference": "84569198dfd5564977d2ae6a32de4beb5a24bdca",
+ "shasum": ""
+ },
+ "require": {
+ "clue/redis-protocol": "^0.3.2",
+ "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+ "php": ">=5.3",
+ "react/event-loop": "^1.2",
+ "react/promise": "^3.2 || ^2.0 || ^1.1",
+ "react/promise-timer": "^1.11",
+ "react/socket": "^1.16"
+ },
+ "require-dev": {
+ "clue/block-react": "^1.5",
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Clue\\React\\Redis\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "Async Redis client implementation, built on top of ReactPHP.",
+ "homepage": "https://github.com/clue/reactphp-redis",
+ "keywords": [
+ "async",
+ "client",
+ "database",
+ "reactphp",
+ "redis"
+ ],
+ "support": {
+ "issues": "https://github.com/clue/reactphp-redis/issues",
+ "source": "https://github.com/clue/reactphp-redis/tree/v2.8.0"
+ },
+ "funding": [
+ {
+ "url": "https://clue.engineering/support",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/clue",
+ "type": "github"
+ }
+ ],
+ "time": "2025-01-03T16:18:33+00:00"
+ },
{
"name": "danharrin/livewire-rate-limiting",
- "version": "v2.2.0",
+ "version": "v2.2.1",
"source": {
"type": "git",
"url": "https://github.com/danharrin/livewire-rate-limiting.git",
@@@ -2620,92 -2445,13 +2622,92 @@@
"description": "Add beautiful and user-friendly forms to your command-line applications.",
"support": {
"issues": "https://github.com/laravel/prompts/issues",
- "source": "https://github.com/laravel/prompts/tree/v0.3.18"
+ "source": "https://github.com/laravel/prompts/tree/v0.3.22"
},
- "time": "2026-05-19T00:47:18+00:00"
+ "time": "2026-08-04T14:50:50+00:00"
},
+ {
+ "name": "laravel/reverb",
- "version": "v1.10.2",
++ "version": "v1.11.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/reverb.git",
- "reference": "43a5c0a99b1aaba33dc32f97fcf51f182dd8c8ac"
++ "reference": "52ce5fd88cd1d7eacfdcf6b91cea4704cc546f27"
+ },
+ "dist": {
+ "type": "zip",
- "url": "https://api.github.com/repos/laravel/reverb/zipball/43a5c0a99b1aaba33dc32f97fcf51f182dd8c8ac",
- "reference": "43a5c0a99b1aaba33dc32f97fcf51f182dd8c8ac",
++ "url": "https://api.github.com/repos/laravel/reverb/zipball/52ce5fd88cd1d7eacfdcf6b91cea4704cc546f27",
++ "reference": "52ce5fd88cd1d7eacfdcf6b91cea4704cc546f27",
+ "shasum": ""
+ },
+ "require": {
+ "clue/redis-react": "^2.6",
+ "guzzlehttp/psr7": "^2.6",
+ "illuminate/console": "^10.47|^11.0|^12.0|^13.0",
+ "illuminate/contracts": "^10.47|^11.0|^12.0|^13.0",
+ "illuminate/http": "^10.47|^11.0|^12.0|^13.0",
+ "illuminate/support": "^10.47|^11.0|^12.0|^13.0",
+ "laravel/prompts": "^0.1.15|^0.2.0|^0.3.0",
+ "php": "^8.2",
+ "pusher/pusher-php-server": "^7.2",
+ "ratchet/rfc6455": "^0.4",
+ "react/promise-timer": "^1.10",
+ "react/socket": "^1.14",
+ "symfony/console": "^6.0|^7.0|^8.0",
+ "symfony/http-foundation": "^6.3|^7.0|^8.0"
+ },
+ "require-dev": {
+ "orchestra/testbench": "^8.36|^9.15|^10.8|^11.0",
+ "pestphp/pest": "^2.0|^3.0|^4.0",
+ "phpstan/phpstan": "^1.10",
+ "ratchet/pawl": "^0.4.1",
+ "react/async": "^4.2",
+ "react/http": "^1.9"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Laravel\\Reverb\\ApplicationManagerServiceProvider",
+ "Laravel\\Reverb\\ReverbServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Reverb\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "[email protected]"
+ },
+ {
+ "name": "Joe Dixon",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "Laravel Reverb provides a real-time WebSocket communication backend for Laravel applications.",
+ "keywords": [
+ "WebSockets",
+ "laravel",
+ "real-time",
+ "websocket"
+ ],
+ "support": {
+ "issues": "https://github.com/laravel/reverb/issues",
- "source": "https://github.com/laravel/reverb/tree/v1.10.2"
++ "source": "https://github.com/laravel/reverb/tree/v1.11.1"
+ },
- "time": "2026-05-10T15:47:52+00:00"
++ "time": "2026-08-06T14:48:58+00:00"
+ },
{
"name": "laravel/sanctum",
- "version": "v4.3.2",
+ "version": "v4.3.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/sanctum.git",
@@@ -6425,595 -6176,6 +6432,595 @@@
},
"time": "2026-06-18T03:57:49+00:00"
},
+ {
+ "name": "ratchet/rfc6455",
- "version": "v0.4.0",
++ "version": "v0.4.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ratchetphp/RFC6455.git",
- "reference": "859d95f85dda0912c6d5b936d036d044e3af47ef"
++ "reference": "9b05f371219cbaf9748b505f139617dd0715592b"
+ },
+ "dist": {
+ "type": "zip",
- "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/859d95f85dda0912c6d5b936d036d044e3af47ef",
- "reference": "859d95f85dda0912c6d5b936d036d044e3af47ef",
++ "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/9b05f371219cbaf9748b505f139617dd0715592b",
++ "reference": "9b05f371219cbaf9748b505f139617dd0715592b",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.4",
+ "psr/http-factory-implementation": "^1.0",
+ "symfony/polyfill-php80": "^1.15"
+ },
+ "require-dev": {
+ "guzzlehttp/psr7": "^2.7",
+ "phpunit/phpunit": "^9.5",
+ "react/socket": "^1.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Ratchet\\RFC6455\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "role": "Developer"
+ },
+ {
+ "name": "Matt Bonneau",
+ "role": "Developer"
+ }
+ ],
+ "description": "RFC6455 WebSocket protocol handler",
+ "homepage": "http://socketo.me",
+ "keywords": [
+ "WebSockets",
+ "rfc6455",
+ "websocket"
+ ],
+ "support": {
+ "chat": "https://gitter.im/reactphp/reactphp",
+ "issues": "https://github.com/ratchetphp/RFC6455/issues",
- "source": "https://github.com/ratchetphp/RFC6455/tree/v0.4.0"
++ "source": "https://github.com/ratchetphp/RFC6455/tree/v0.4.1"
+ },
- "time": "2025-02-24T01:18:22+00:00"
++ "time": "2026-06-06T14:34:23+00:00"
+ },
+ {
+ "name": "react/cache",
+ "version": "v1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/cache.git",
+ "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+ "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "react/promise": "^3.0 || ^2.0 || ^1.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "React\\Cache\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "[email protected]",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "[email protected]",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
+ "description": "Async, Promise-based cache interface for ReactPHP",
+ "keywords": [
+ "cache",
+ "caching",
+ "promise",
+ "reactphp"
+ ],
+ "support": {
+ "issues": "https://github.com/reactphp/cache/issues",
+ "source": "https://github.com/reactphp/cache/tree/v1.2.0"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2022-11-30T15:59:55+00:00"
+ },
+ {
+ "name": "react/dns",
+ "version": "v1.14.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/dns.git",
+ "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/dns/zipball/7562c05391f42701c1fccf189c8225fece1cd7c3",
+ "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "react/cache": "^1.0 || ^0.6 || ^0.5",
+ "react/event-loop": "^1.2",
+ "react/promise": "^3.2 || ^2.7 || ^1.2.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+ "react/async": "^4.3 || ^3 || ^2",
+ "react/promise-timer": "^1.11"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "React\\Dns\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "[email protected]",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "[email protected]",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
+ "description": "Async DNS resolver for ReactPHP",
+ "keywords": [
+ "async",
+ "dns",
+ "dns-resolver",
+ "reactphp"
+ ],
+ "support": {
+ "issues": "https://github.com/reactphp/dns/issues",
+ "source": "https://github.com/reactphp/dns/tree/v1.14.0"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2025-11-18T19:34:28+00:00"
+ },
+ {
+ "name": "react/event-loop",
+ "version": "v1.6.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/event-loop.git",
+ "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/event-loop/zipball/ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
+ "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+ },
+ "suggest": {
+ "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "React\\EventLoop\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "[email protected]",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "[email protected]",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
+ "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
+ "keywords": [
+ "asynchronous",
+ "event-loop"
+ ],
+ "support": {
+ "issues": "https://github.com/reactphp/event-loop/issues",
+ "source": "https://github.com/reactphp/event-loop/tree/v1.6.0"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2025-11-17T20:46:25+00:00"
+ },
+ {
+ "name": "react/promise",
+ "version": "v3.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/promise.git",
+ "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+ "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1.0"
+ },
+ "require-dev": {
+ "phpstan/phpstan": "1.12.28 || 1.4.10",
+ "phpunit/phpunit": "^9.6 || ^7.5"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "React\\Promise\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jan Sorgalla",
+ "email": "[email protected]",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "[email protected]",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
+ "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+ "keywords": [
+ "promise",
+ "promises"
+ ],
+ "support": {
+ "issues": "https://github.com/reactphp/promise/issues",
+ "source": "https://github.com/reactphp/promise/tree/v3.3.0"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2025-08-19T18:57:03+00:00"
+ },
+ {
+ "name": "react/promise-timer",
+ "version": "v1.11.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/promise-timer.git",
+ "reference": "4f70306ed66b8b44768941ca7f142092600fafc1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/promise-timer/zipball/4f70306ed66b8b44768941ca7f142092600fafc1",
+ "reference": "4f70306ed66b8b44768941ca7f142092600fafc1",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3",
+ "react/event-loop": "^1.2",
+ "react/promise": "^3.2 || ^2.7.0 || ^1.2.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "React\\Promise\\Timer\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "[email protected]",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "[email protected]",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
+ "description": "A trivial implementation of timeouts for Promises, built on top of ReactPHP.",
+ "homepage": "https://github.com/reactphp/promise-timer",
+ "keywords": [
+ "async",
+ "event-loop",
+ "promise",
+ "reactphp",
+ "timeout",
+ "timer"
+ ],
+ "support": {
+ "issues": "https://github.com/reactphp/promise-timer/issues",
+ "source": "https://github.com/reactphp/promise-timer/tree/v1.11.0"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2024-06-04T14:27:45+00:00"
+ },
+ {
+ "name": "react/socket",
+ "version": "v1.17.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/socket.git",
+ "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/socket/zipball/ef5b17b81f6f60504c539313f94f2d826c5faa08",
+ "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08",
+ "shasum": ""
+ },
+ "require": {
+ "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+ "php": ">=5.3.0",
+ "react/dns": "^1.13",
+ "react/event-loop": "^1.2",
+ "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+ "react/stream": "^1.4"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+ "react/async": "^4.3 || ^3.3 || ^2",
+ "react/promise-stream": "^1.4",
+ "react/promise-timer": "^1.11"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "React\\Socket\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "[email protected]",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "[email protected]",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
+ "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
+ "keywords": [
+ "Connection",
+ "Socket",
+ "async",
+ "reactphp",
+ "stream"
+ ],
+ "support": {
+ "issues": "https://github.com/reactphp/socket/issues",
+ "source": "https://github.com/reactphp/socket/tree/v1.17.0"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2025-11-19T20:47:34+00:00"
+ },
+ {
+ "name": "react/stream",
+ "version": "v1.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/reactphp/stream.git",
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+ "shasum": ""
+ },
+ "require": {
+ "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+ "php": ">=5.3.8",
+ "react/event-loop": "^1.2"
+ },
+ "require-dev": {
+ "clue/stream-filter": "~1.2",
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "React\\Stream\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "[email protected]",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "[email protected]",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "[email protected]",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "[email protected]",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
+ "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
+ "keywords": [
+ "event-driven",
+ "io",
+ "non-blocking",
+ "pipe",
+ "reactphp",
+ "readable",
+ "stream",
+ "writable"
+ ],
+ "support": {
+ "issues": "https://github.com/reactphp/stream/issues",
+ "source": "https://github.com/reactphp/stream/tree/v1.4.0"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/reactphp",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2024-06-11T12:45:25+00:00"
+ },
{
"name": "resend/resend-laravel",
"version": "v0.20.0",
diff --cc config/constants.php
index c282d13caa,e0aefe8e2b..4e73bd09c1
--- a/config/constants.php
+++ b/config/constants.php
@@@ -2,8 -2,9 +2,8 @@@
return [
'coolify' => [
- 'version' => '4.2.0',
- 'helper_version' => '1.0.14',
+ 'version' => env('COOLIFY_VERSION') ?: '4.3.9',
+ 'helper_version' => '1.0.15',
- 'realtime_version' => '1.0.17',
'railpack_version' => '0.23.0',
'self_hosted' => env('SELF_HOSTED', true),
'autoupdate' => env('AUTOUPDATE'),
diff --cc docker-compose.dev-multi.yml
index 0000000000,3ce7b4bf3c..d9d414b8ab
mode 000000,100644..100644
--- a/docker-compose.dev-multi.yml
+++ b/docker-compose.dev-multi.yml
@@@ -1,0 -1,220 +1,195 @@@
+ # Multi-instance Coolify (isolated project/network/volumes per instance).
+ #
+ # ./scripts/dev-instances up # a + b
+ # ./scripts/dev-instances urls
+ # ./scripts/dev-instances down
+ #
+ # Manual:
+ # docker compose -p coolify-a -f docker-compose.dev-multi.yml --env-file .dev-instances/a.env up -d
+ #
+ # Optional profiles: vite, mailpit, minio, testing-host
+ # ./scripts/dev-instances up a --with vite mailpit
+ #
-# Ports (a / b): app 8000/8001, db 5432/5433, redis 6379/6380, soketi 6001/6011
++# Ports (a / b): app 8000/8001, db 5432/5433, redis 6379/6380, Reverb 6001/6011
+
+ services:
+ coolify:
+ image: coolify:dev
+ pull_policy: never
+ build:
+ context: .
+ dockerfile: ./docker/development/Dockerfile
+ args:
+ - USER_ID=${USERID:-1000}
+ - GROUP_ID=${GROUPID:-1000}
+ ports:
+ - "${APP_PORT:-8000}:8080"
++ - "${FORWARD_PUSHER_PORT:-6001}:6001"
++ - "${FORWARD_TERMINAL_PORT:-6002}:6002"
+ extra_hosts:
+ - "host.docker.internal:host-gateway"
+ environment:
+ AUTORUN_ENABLED: "${AUTORUN_ENABLED:-false}"
+ APP_NAME: "${APP_NAME:-Coolify}"
+ APP_URL: "${APP_URL:-http://localhost:8000}"
+ APP_KEY: "${APP_KEY:-}"
+ APP_ENV: "${APP_ENV:-local}"
+ APP_DEBUG: "${APP_DEBUG:-true}"
+ DB_CONNECTION: pgsql
+ DB_HOST: postgres
+ DB_PORT: 5432
+ DB_DATABASE: "${DB_DATABASE:-coolify}"
+ DB_USERNAME: "${DB_USERNAME:-coolify}"
+ DB_PASSWORD: "${DB_PASSWORD:-password}"
+ REDIS_HOST: redis
+ REDIS_PORT: 6379
+ REDIS_PASSWORD: "${REDIS_PASSWORD:-null}"
+ COOLIFY_CONTAINER_ROLE: all
- PUSHER_HOST: ""
- PUSHER_PORT: ""
++ PUSHER_HOST: coolify
++ PUSHER_PORT: 6001
++ PUSHER_BACKEND_PORT: 6001
+ PUSHER_SCHEME: http
+ PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
+ PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
+ PUSHER_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
- BROADCAST_CONNECTION: pusher
++ BROADCAST_CONNECTION: reverb
+ QUEUE_CONNECTION: redis
+ CACHE_STORE: redis
+ SESSION_DRIVER: redis
+ healthcheck:
+ test: curl -sf http://127.0.0.1:8080/api/health || exit 1
+ interval: 5s
+ retries: 10
+ timeout: 2s
+ volumes:
+ - .:/var/www/html/:cached
+ - backups_data:/var/www/html/storage/app/backups
++ - ./docker/coolify-terminal/terminal-server.js:/terminal/terminal-server.js
++ - ./docker/coolify-terminal/terminal-utils.js:/terminal/terminal-utils.js
+ depends_on:
+ postgres:
+ condition: service_healthy
+ redis:
+ condition: service_healthy
+ networks:
+ - coolify
+
+ postgres:
+ image: postgres:15-alpine
+ pull_policy: always
+ ports:
+ - "${FORWARD_DB_PORT:-5432}:5432"
+ environment:
+ POSTGRES_USER: "${DB_USERNAME:-coolify}"
+ POSTGRES_PASSWORD: "${DB_PASSWORD:-password}"
+ POSTGRES_DB: "${DB_DATABASE:-coolify}"
+ POSTGRES_HOST_AUTH_METHOD: "trust"
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+ interval: 5s
+ retries: 10
+ timeout: 2s
+ volumes:
+ - postgres_data:/var/lib/postgresql/data
+ networks:
+ - coolify
+
+ redis:
+ image: redis:7-alpine
+ pull_policy: always
+ ports:
+ - "${FORWARD_REDIS_PORT:-6379}:6379"
+ healthcheck:
+ test: redis-cli ping
+ interval: 5s
+ retries: 10
+ timeout: 2s
+ volumes:
+ - redis_data:/data
+ networks:
+ - coolify
+
- soketi:
- image: coolify-realtime:dev
- pull_policy: never
- build:
- context: .
- dockerfile: ./docker/coolify-realtime/Dockerfile
- ports:
- - "${FORWARD_SOKETI_PORT:-6001}:6001"
- - "${FORWARD_SOKETI_PORT_ALT:-6002}:6002"
- extra_hosts:
- - "host.docker.internal:host-gateway"
- volumes:
- - ./storage:/var/www/html/storage
- - ./docker/coolify-realtime/terminal-server.js:/terminal/terminal-server.js
- - ./docker/coolify-realtime/terminal-utils.js:/terminal/terminal-utils.js
- environment:
- SOKETI_DEBUG: "false"
- SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}"
- SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
- SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
- SOKETI_HOST: "0.0.0.0"
- healthcheck:
- test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:6001/ready && curl -fsS http://127.0.0.1:6002/ready || exit 1"]
- interval: 5s
- retries: 10
- timeout: 2s
- entrypoint: ["/bin/sh", "/soketi-entrypoint.sh"]
- networks:
- - coolify
-
+ vite:
+ profiles: ["vite"]
+ image: node:24-alpine
+ pull_policy: always
+ working_dir: /var/www/html
+ environment:
+ VITE_HOST: localhost
+ VITE_PORT: "${VITE_PORT:-5173}"
+ ports:
+ - "${VITE_PORT:-5173}:${VITE_PORT:-5173}"
+ volumes:
+ - .:/var/www/html/:cached
+ command: sh -c "npm install && npm run dev -- --port ${VITE_PORT:-5173} --host"
+ networks:
+ - coolify
+
+ testing-host:
+ profiles: ["testing-host"]
+ image: coolify-testing-host:dev
+ pull_policy: never
+ build:
+ context: .
+ dockerfile: ./docker/testing-host/Dockerfile
+ init: true
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock
+ - coolify_data:/data/coolify
+ - backups_data:/data/coolify/backups
+ - postgres_data:/data/coolify/_volumes/database
+ - redis_data:/data/coolify/_volumes/redis
+ - minio_data:/data/coolify/_volumes/minio
+ networks:
+ - coolify
+
+ mailpit:
+ profiles: ["mailpit"]
+ image: axllent/mailpit:latest
+ pull_policy: always
+ ports:
+ - "${FORWARD_MAILPIT_PORT:-1025}:1025"
+ - "${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025"
+ networks:
+ - coolify
+
+ minio:
+ profiles: ["minio"]
+ image: coollabsio/maxio:latest
+ pull_policy: always
+ ports:
+ - "${FORWARD_MINIO_PORT:-9000}:9000"
+ - "${FORWARD_MINIO_PORT_CONSOLE:-9001}:9001"
+ environment:
+ MINIO_ACCESS_KEY: minioadmin
+ MINIO_SECRET_KEY: minioadmin
+ volumes:
+ - minio_data:/data
+ networks:
+ - coolify
+
+ minio-init:
+ profiles: ["minio"]
+ image: minio/mc:latest
+ pull_policy: always
+ restart: "no"
+ depends_on:
+ - minio
+ entrypoint: >
+ /bin/sh -c "
+ until mc alias set local http://minio:9000 minioadmin minioadmin 2>/dev/null; do sleep 2; done;
+ mc mb local/local --ignore-existing;
+ "
+ networks:
+ - coolify
+
+ volumes:
+ backups_data:
+ postgres_data:
+ redis_data:
+ coolify_data:
+ minio_data:
+
+ networks:
+ coolify:
+ driver: bridge
diff --cc docker-compose.dev.yml
index 375415e25c,76aa0b88eb..9a53202fd7
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@@ -9,16 -9,14 +9,17 @@@ services
- USER_ID=${USERID:-1000}
- GROUP_ID=${GROUPID:-1000}
ports:
- - "${APP_PORT:-8000}:8080"
- - "${FORWARD_PUSHER_PORT:-6001}:6001"
- - "6002:6002"
+ - "${DEV_BIND_ADDRESS:-0.0.0.0}:${APP_PORT:-8000}:8080"
++ - "${DEV_BIND_ADDRESS:-0.0.0.0}:${FORWARD_PUSHER_PORT:-6001}:6001"
++ - "${DEV_BIND_ADDRESS:-0.0.0.0}:6002:6002"
extra_hosts:
- "host.docker.internal:host-gateway"
environment:
AUTORUN_ENABLED: false
+ COOLIFY_CONTAINER_ROLE: "${COOLIFY_CONTAINER_ROLE:-all}"
- PUSHER_HOST: "${PUSHER_HOST:-}"
- PUSHER_PORT: "${PUSHER_PORT:-}"
+ PUSHER_HOST: "${PUSHER_HOST:-coolify}"
+ PUSHER_PORT: "${PUSHER_PORT:-6001}"
+ PUSHER_BACKEND_PORT: "${PUSHER_BACKEND_PORT:-6001}"
PUSHER_SCHEME: "${PUSHER_SCHEME:-http}"
PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
diff --cc docker/development/Dockerfile
index 586add9177,eb4970bd8c..f88b71a7eb
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@@ -57,12 -58,8 +58,13 @@@ RUN apk upgrade --no-cache &&
# Install system dependencies
RUN apk add --no-cache \
postgresql${POSTGRES_VERSION}-client \
+ nodejs \
+ npm \
+ make \
+ g++ \
+ python3 \
openssh-client \
+ openssl \
git \
git-lfs \
jq \
diff --cc jean.json
index f638feab80,7e4bcc00bc..77cf921f7a
--- a/jean.json
+++ b/jean.json
@@@ -1,8 -1,8 +1,8 @@@
{
"scripts": {
- "setup": "cp $JEAN_ROOT_PATH/.env . && mkdir -p .claude && cp $JEAN_ROOT_PATH/.claude/settings.local.json .claude/settings.local.json",
+ "setup": "cp $JEAN_ROOT_PATH/.env .",
"teardown": null,
- "run": "docker rm -f coolify coolify-minio-init coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite; spin up; spin down"
- "run": "docker rm -f coolify coolify-minio-init coolify-realtime coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite; docker compose -f docker-compose.yml -f docker-compose.dev.yml up; docker compose -f docker-compose.yml -f docker-compose.dev.yml down"
++ "run": "docker rm -f coolify coolify-minio-init coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite; docker compose -f docker-compose.yml -f docker-compose.dev.yml up; docker compose -f docker-compose.yml -f docker-compose.dev.yml down"
},
"ports": [
{
diff --cc other/nightly/versions.json
index b483549167,92a88ea023..d868ff224e
--- a/other/nightly/versions.json
+++ b/other/nightly/versions.json
@@@ -1,16 -1,19 +1,16 @@@
{
"coolify": {
"v4": {
- "version": "4.1.2"
+ "version": "4.3.9"
},
"nightly": {
- "version": "4.2.0"
+ "version": "4.3.10"
},
"helper": {
- "version": "1.0.14"
+ "version": "1.0.15"
},
- "realtime": {
- "version": "1.0.17"
- },
"sentinel": {
- "version": "0.0.21"
+ "version": "0.0.22"
}
},
"traefik": {
diff --cc phpunit.xml
index 5d55acf750,6ddcaed7dc..b1091f2abd
--- a/phpunit.xml
+++ b/phpunit.xml
@@@ -21,8 -21,9 +21,9 @@@
<env name="MAIL_MAILER" value="array" force="true"/>
<env name="QUEUE_CONNECTION" value="sync" force="true"/>
<env name="SESSION_DRIVER" value="array" force="true"/>
- <env name="TELESCOPE_ENABLED" value="false"/>
<env name="NIGHTWATCH_ENABLED" value="false"/>
- <!-- Host-side Pest browser runs cannot resolve docker DNS (coolify-realtime). -->
++ <!-- Disable broadcasting for host-side Pest browser runs. -->
+ <env name="BROADCAST_DRIVER" value="null" force="true"/>
</php>
<source>
<include>
diff --cc scripts/dev-instances
index 0000000000,eac6b84383..36437807e6
mode 000000,100755..100755
--- a/scripts/dev-instances
+++ b/scripts/dev-instances
@@@ -1,0 -1,317 +1,317 @@@
+ #!/usr/bin/env bash
+ # Two local Coolify instances (isolated stacks) for multi-control-plane testing.
+ #
+ # Usage:
+ # ./scripts/dev-instances up # start a + b
+ # ./scripts/dev-instances up a # start a only
+ # ./scripts/dev-instances up a --with vite # HMR only for a single instance
+ # ./scripts/dev-instances down # stop a + b
+ # ./scripts/dev-instances urls
+ # ./scripts/dev-instances ps
+ # ./scripts/dev-instances logs a
+ # ./scripts/dev-instances exec a php artisan migrate --force
+ #
+ # Ports (fixed):
-# a app 8000 db 5432 redis 6379 soketi 6001/6002 flux 6443
-# b app 8001 db 5433 redis 6380 soketi 6011/6012 flux 6444
++# a app 8000 db 5432 redis 6379 Reverb 6001/6002 flux 6443
++# b app 8001 db 5433 redis 6380 Reverb 6011/6012 flux 6444
+ #
+ # Frontend: multi-instance uses npm run build (shared public/build). Do not use
+ # two Vite HMR servers — public/hot is a single shared file.
+ #
+ # Compose: docker-compose.dev-multi.yml
+ # Env: .dev-instances/{a,b}.env (generated, gitignored)
+ #
+ set -euo pipefail
+
+ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ cd "$ROOT"
+
+ COMPOSE_FILE="docker-compose.dev-multi.yml"
+ ENV_DIR=".dev-instances"
+ INSTANCES_ALL=(a b)
+
+ usage() {
+ sed -n '2,18p' "$0" | sed 's/^# \?//'
+ exit "${1:-0}"
+ }
+
+ # Fixed port offsets: a=0, b=1
+ instance_offset() {
+ case "$1" in
+ a|1) echo 0 ;;
+ b|2) echo 1 ;;
+ *)
+ echo "Unknown instance '$1' (use a or b)" >&2
+ exit 1
+ ;;
+ esac
+ }
+
+ normalize_name() {
+ case "$1" in
+ a|1) echo a ;;
+ b|2) echo b ;;
+ *)
+ echo "Unknown instance '$1' (use a or b)" >&2
+ exit 1
+ ;;
+ esac
+ }
+
+ project_name() { echo "coolify-$1"; }
+ env_file() { echo "${ENV_DIR}/$1.env"; }
+
+ ensure_env() {
+ local name="$1"
+ local offset env_file app_port existing_key key
+ offset="$(instance_offset "$name")"
+ env_file="$(env_file "$name")"
+ app_port=$((8000 + offset))
+ mkdir -p "$ENV_DIR"
+
+ # Never rotate APP_KEY once set: encrypted DB columns (private keys, secrets)
+ # become unreadable ("The MAC is invalid") if APP_KEY changes while volumes persist.
+ existing_key=""
+ if [[ -f "$env_file" ]]; then
+ existing_key="$(grep -E '^APP_KEY=base64:' "$env_file" 2>/dev/null | tail -n1 | cut -d= -f2- || true)"
+ fi
+ if [[ -z "$existing_key" && -f ".dev-instances/${name}.appkey" ]]; then
+ existing_key="$(cat ".dev-instances/${name}.appkey" 2>/dev/null || true)"
+ fi
+ if [[ -z "$existing_key" ]]; then
+ existing_key="base64:$(openssl rand -base64 32)"
+ fi
+ printf '%s\n' "$existing_key" >".dev-instances/${name}.appkey"
+
+ cat >"$env_file" <<EOF
+ # Generated by scripts/dev-instances for instance ${name} — do not commit
+ COMPOSE_PROJECT_NAME=coolify-${name}
+ APP_NAME=Coolify-${name}
+ APP_ENV=local
+ APP_DEBUG=true
+ APP_URL=http://localhost:${app_port}
+ APP_KEY=${existing_key}
+ APP_PORT=${app_port}
+ FORWARD_DB_PORT=$((5432 + offset))
+ FORWARD_REDIS_PORT=$((6379 + offset))
-FORWARD_SOKETI_PORT=$((6001 + offset * 10))
-FORWARD_SOKETI_PORT_ALT=$((6002 + offset * 10))
++FORWARD_PUSHER_PORT=$((6001 + offset * 10))
++FORWARD_TERMINAL_PORT=$((6002 + offset * 10))
+ FORWARD_FLUX_PORT=$((6443 + offset))
+ VITE_PORT=$((5173 + offset))
+ FORWARD_MAILPIT_PORT=$((1025 + offset * 100))
+ FORWARD_MAILPIT_DASHBOARD_PORT=$((8025 + offset * 100))
+ FORWARD_MINIO_PORT=$((9000 + offset * 10))
+ FORWARD_MINIO_PORT_CONSOLE=$((9001 + offset * 10))
+ DB_DATABASE=coolify
+ DB_USERNAME=coolify
+ DB_PASSWORD=password
+ PUSHER_APP_ID=coolify-${name}
+ PUSHER_APP_KEY=coolify-${name}
+ PUSHER_APP_SECRET=coolify-${name}
+ EOF
+ }
+
+ compose() {
+ local name="$1"
+ shift
+ local -a profiles=()
+ local p
+ for p in "${PROFILES[@]:-}"; do
+ [[ -n "$p" ]] && profiles+=(--profile "$p")
+ done
+ ensure_env "$name"
+ docker compose -p "$(project_name "$name")" -f "$COMPOSE_FILE" --env-file "$(env_file "$name")" "${profiles[@]}" "$@"
+ }
+
+ # Parse: [a] [b] [--with vite mailpit ...]
+ # Default instances when none given: a b
+ parse_args() {
+ NAMES=()
+ PROFILES=()
+ local mode=names
+ local arg
+ for arg in "$@"; do
+ if [[ "$arg" == "--with" ]]; then
+ mode=profiles
+ continue
+ fi
+ if [[ "$mode" == "profiles" ]]; then
+ PROFILES+=("$arg")
+ else
+ NAMES+=("$(normalize_name "$arg")")
+ fi
+ done
+ if [[ ${#NAMES[@]} -eq 0 ]]; then
+ NAMES=("${INSTANCES_ALL[@]}")
+ fi
+ }
+
+ # Multi-instance stacks share the repo bind-mount. Laravel's public/hot can only
+ # point at one Vite server, so dual HMR is broken (last Vite wins → missing CSS).
+ # Use a production frontend build shared by all instances instead.
+ ensure_frontend_assets() {
+ if [[ -f public/hot ]]; then
+ echo "Removing public/hot (multi-instance cannot share Vite HMR)..."
+ rm -f public/hot
+ fi
+ if [[ ! -d node_modules ]]; then
+ echo "Installing npm dependencies..."
+ npm install
+ fi
+ if [[ ! -f public/build/manifest.json ]]; then
+ echo "Building frontend assets (npm run build)..."
+ npm run build || {
+ echo "Warning: npm run build failed — UI will have no CSS/JS." >&2
+ return 1
+ }
+ return
+ fi
+ # Rebuild if CSS entry is missing from disk (stale/partial build).
+ local css
+ css="$(php -r '
+ $m=@json_decode(@file_get_contents("public/build/manifest.json"), true);
+ $f=$m["resources/css/app.css"]["file"] ?? "";
+ echo $f && is_file("public/build/".$f) ? "ok" : "missing";
+ ' 2>/dev/null || echo missing)"
+ if [[ "$css" != "ok" ]]; then
+ echo "Frontend build incomplete — running npm run build..."
+ npm run build || echo "Warning: npm run build failed." >&2
+ fi
+ }
+
+ # Vite profile is only useful for a single instance; drop it when starting both.
+ filter_vite_profile() {
+ local -a kept=()
+ local p want_vite=0
+ for p in "${PROFILES[@]:-}"; do
+ if [[ "$p" == "vite" ]]; then
+ want_vite=1
+ continue
+ fi
+ kept+=("$p")
+ done
+ if [[ $want_vite -eq 1 ]]; then
+ if [[ ${#NAMES[@]} -gt 1 ]]; then
+ echo "Note: ignoring --with vite (shared public/hot cannot serve two instances)."
+ echo " Frontend uses npm run build. For HMR, run a single instance: $0 up a --with vite"
+ else
+ kept+=("vite")
+ fi
+ fi
+ PROFILES=("${kept[@]}")
+ }
+
+ cmd_up() {
+ parse_args "$@"
+ filter_vite_profile
+ # Prefer built assets before containers serve HTML.
+ ensure_frontend_assets || true
+ local name
+ local -a saved_profiles=("${PROFILES[@]:-}")
+ for name in "${NAMES[@]}"; do
+ PROFILES=("${saved_profiles[@]}")
+ # Only the first (only) instance may run the vite profile.
+ if [[ ${#NAMES[@]} -eq 1 ]] && printf '%s\n' "${PROFILES[@]:-}" | grep -qx vite; then
+ :
+ else
+ local -a no_vite=()
+ local p
+ for p in "${PROFILES[@]:-}"; do
+ [[ "$p" != "vite" ]] && no_vite+=("$p")
+ done
+ PROFILES=("${no_vite[@]}")
+ fi
+ echo "==> Starting ${name} → http://localhost:$((8000 + $(instance_offset "$name")))"
+ compose "$name" up -d --build
+ done
+ # If a lone instance started vite, keep public/hot; otherwise force built assets.
+ if [[ ${#NAMES[@]} -gt 1 ]] || ! printf '%s\n' "${saved_profiles[@]:-}" | grep -qx vite; then
+ ensure_frontend_assets || true
+ fi
+ echo
+ cmd_urls "${NAMES[@]}"
+ echo
+ echo "Frontend: production build (public/build). Both instances share the same assets."
+ }
+
+ cmd_down() {
+ parse_args "$@"
+ local name
+ for name in "${NAMES[@]}"; do
+ if [[ ! -f "$(env_file "$name")" ]]; then
+ ensure_env "$name" >/dev/null
+ fi
+ echo "==> Stopping ${name}"
+ compose "$name" down --remove-orphans
+ done
+ }
+
+ cmd_ps() {
+ parse_args "$@"
+ local name
+ for name in "${NAMES[@]}"; do
+ [[ -f "$(env_file "$name")" ]] || ensure_env "$name" >/dev/null
+ echo "==> $(project_name "$name")"
+ compose "$name" ps
+ echo
+ done
+ }
+
+ cmd_urls() {
+ local names=("$@")
+ if [[ ${#names[@]} -eq 0 ]]; then
+ names=("${INSTANCES_ALL[@]}")
+ else
+ parse_args "$@"
+ names=("${NAMES[@]}")
+ fi
+ printf '%-6s %-28s %-8s %-8s %-12s\n' "NAME" "URL" "DB" "REDIS" "SOKETI"
+ local name envf
+ for name in "${names[@]}"; do
+ name="$(normalize_name "$name")"
+ ensure_env "$name" >/dev/null
+ envf="$(env_file "$name")"
+ printf '%-6s %-28s %-8s %-8s %-12s\n' \
+ "$name" \
+ "$(grep -E '^APP_URL=' "$envf" | cut -d= -f2-)" \
+ "$(grep -E '^FORWARD_DB_PORT=' "$envf" | cut -d= -f2-)" \
+ "$(grep -E '^FORWARD_REDIS_PORT=' "$envf" | cut -d= -f2-)" \
- "$(grep -E '^FORWARD_SOKETI_PORT=' "$envf" | cut -d= -f2-)"
++ "$(grep -E '^FORWARD_PUSHER_PORT=' "$envf" | cut -d= -f2-)"
+ done
+ }
+
+ cmd_logs() {
+ local name="${1:-}"
+ shift || true
+ [[ -z "$name" ]] && usage 1
+ name="$(normalize_name "$name")"
+ compose "$name" logs -f "$@"
+ }
+
+ cmd_exec() {
+ local name="${1:-}"
+ shift || true
+ [[ -z "$name" || $# -eq 0 ]] && usage 1
+ name="$(normalize_name "$name")"
+ compose "$name" exec coolify "$@"
+ }
+
+ main() {
+ local cmd="${1:-}"
+ shift || true
+ case "$cmd" in
+ up) cmd_up "$@" ;;
+ down) cmd_down "$@" ;;
+ ps) cmd_ps "$@" ;;
+ urls|ls|list) cmd_urls "$@" ;;
+ logs) cmd_logs "$@" ;;
+ exec) cmd_exec "$@" ;;
+ -h|--help|help|"") usage 0 ;;
+ *)
+ echo "Unknown command: $cmd" >&2
+ usage 1
+ ;;
+ esac
+ }
+
+ main "$@"
diff --cc tests/Feature/RealtimeTerminalPackagingTest.php
index 4fccd53b7e,85191bc25e..3c9d3d63f6
--- a/tests/Feature/RealtimeTerminalPackagingTest.php
+++ b/tests/Feature/RealtimeTerminalPackagingTest.php
@@@ -1,13 -1,203 +1,206 @@@
<?php
+ it('renders the resource terminal shell while containers are discovered', function () {
+ $terminalComponent = file_get_contents(app_path('Livewire/Project/Shared/ExecuteContainerCommand.php'));
+ $terminalView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+
+ expect($terminalComponent)
+ ->toContain('public bool $containersLoaded = false;')
+ ->and($terminalView)
+ ->toContain('wire:init="loadContainers"')
+ ->not->toContain('@if (! $containersLoaded)')
+ ->not->toContain('Loading terminal containers…')
+ ->toContain(':auto-start="$type === \'server\' || ! $containersLoaded || $containers->count() === 1"')
+ ->not->toContain('Loading targets…')
+ ->not->toContain('<x-loading text="Loading containers" />');
+ });
+
+ it('marks stopped services as loaded before the terminal page first renders', function () {
+ $terminalComponent = file_get_contents(app_path('Livewire/Project/Shared/ExecuteContainerCommand.php'));
+
+ expect($terminalComponent)
+ ->toMatch('/elseif \(data_get\(\$this->parameters, \'service_uuid\'\)\).*?if \(! \$this->resource->isRunning\(\)\) \{\s*\$this->containersLoaded = true;\s*\}/s');
+ });
+
+ it('provides opt-in diagnostics for connected terminal theme changes', function () {
+ $terminalClient = file_get_contents(resource_path('js/terminal.js'));
+
+ expect($terminalClient)
+ ->toContain('terminal-debug')
+ ->toContain("'[Terminal Theme] Applying theme'")
+ ->toContain("'[Terminal Theme] Theme applied'")
+ ->toContain('requestedTheme: themeName')
+ ->toContain('shellTheme: shell?.dataset.consoleTheme')
+ ->toContain("getComputedStyle(shell, '::before').background");
+ });
+
+ it('starts a single discovered resource container without waiting for a missed browser event', function () {
+ $terminalComponent = file_get_contents(app_path('Livewire/Project/Shared/ExecuteContainerCommand.php'));
+ $terminalView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+
+ expect($terminalComponent)
+ ->toMatch('/if \(\$this->containers->count\(\) === 1\) \{\s*\$this->selected_container = [^;]+;\s*\$this->connectToContainer\(\);/s')
+ ->and($terminalView)
+ ->not->toContain('x-on:containers-loaded.window');
+ });
+
+ it('integrates automatic terminal startup into the terminal console', function () {
+ $terminalComponent = file_get_contents(app_path('Livewire/Project/Shared/Terminal.php'));
+ $terminalView = file_get_contents(resource_path('views/livewire/project/shared/terminal.blade.php'));
+ $commandView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+
+ expect($terminalComponent)
+ ->toContain('public bool $autoStart = false;')
+ ->and($terminalView)
+ ->toContain('data-auto-start="{{ $autoStart ? \'true\' : \'false\' }}"')
+ ->toContain("starting ? 'connecting…'")
+ ->and($commandView)
+ ->toContain(':auto-start="$type === \'server\' || ! $containersLoaded || $containers->count() === 1"')
+ ->not->toContain('terminalLoading')
+ ->not->toContain('Starting terminal');
+ });
+
+ it('resynchronizes the themed canvas whenever a terminal enters a loading state', function () {
+ $resourceView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+ $globalView = file_get_contents(resource_path('views/livewire/terminal/index.blade.php'));
+
+ foreach ([$resourceView, $globalView] as $view) {
+ expect($view)
+ ->toContain('x-on:terminal-starting.window="syncTheme()"')
+ ->toContain('syncTheme() {')
+ ->toContain("this.consoleTheme = this.themeKeys.includes(savedTheme) ? savedTheme : 'system';");
+ }
+ });
+
+ it('keeps the xterm mount visible while the terminal connection starts', function () {
+ $terminalView = file_get_contents(resource_path('views/livewire/project/shared/terminal.blade.php'));
+
+ expect($terminalView)
+ ->toMatch('/<div id="terminal"[^>]*wire:ignore/s')
+ ->not->toMatch('/<div id="terminal"[^>]*x-show="terminalActive"/s');
+ });
+
+ it('shows the initial resource container launcher and keeps the header picker for switching', function () {
+ $commandView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+
+ expect($commandView)
+ ->toContain('targetChosen: @js($selected_container !== \'default\')')
+ ->toContain('data-terminal-target-picker="launcher"')
+ ->toContain('x-show="!targetChosen"')
+ ->toContain('x-show="targetChosen"')
+ ->toContain('this.targetChosen = true;');
+ });
+
+ it('uses a larger high-contrast label for every terminal loading phase', function () {
+ $resourceView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+ $terminalView = file_get_contents(resource_path('views/livewire/project/shared/terminal.blade.php'));
+ $globalView = file_get_contents(resource_path('views/livewire/terminal/index.blade.php'));
+ $styles = file_get_contents(resource_path('css/app.css'));
+
+ expect(substr_count($resourceView.$terminalView.$globalView, 'terminal-loading-label'))
+ ->toBeGreaterThanOrEqual(2)
+ ->and($styles)
+ ->toContain('.terminal-loading-label')
+ ->toContain('font-size: 0.875rem;')
+ ->toContain('color: rgb(255 255 255 / 0.75);')
+ ->toContain('html:not(.dark) .application-console-shell[data-console-theme="system"] .terminal-loading-label');
+ });
+
+ it('styles centered terminal target pickers from the selected console theme', function () {
+ $resourceView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+ $globalView = file_get_contents(resource_path('views/livewire/terminal/index.blade.php'));
+ $styles = file_get_contents(resource_path('css/app.css'));
+
+ expect(substr_count($resourceView.$globalView, 'terminal-target-picker'))
+ ->toBeGreaterThanOrEqual(2)
+ ->and($styles)
+ ->toContain('.terminal-target-picker')
+ ->toContain('.application-console-shell[data-console-theme="system"] .terminal-target-picker')
+ ->toContain('background: rgb(0 0 0 / 0.18);')
+ ->toContain('background: #fff;')
+ ->toContain('color: #52525b;');
+ });
+
+ it('presents initial terminal targets as a top-aligned launcher instead of a centered dialog', function () {
+ $resourceView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+ $globalView = file_get_contents(resource_path('views/livewire/terminal/index.blade.php'));
+
+ expect($resourceView.$globalView)
+ ->toContain('data-terminal-target-picker="launcher"')
+ ->toContain('items-start justify-start')
+ ->toContain('Start a terminal session')
+ ->not->toContain('data-terminal-target-picker="center"');
+ });
+
+ it('shows connection progress in the terminal body instead of the header', function () {
+ $resourceView = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+ $globalView = file_get_contents(resource_path('views/livewire/terminal/index.blade.php'));
+ $terminalView = file_get_contents(resource_path('views/livewire/project/shared/terminal.blade.php'));
+ $terminalClient = file_get_contents(resource_path('js/terminal.js'));
+
+ expect($resourceView.$globalView)
+ ->toContain("new CustomEvent('terminal-starting')")
+ ->not->toContain('wire:loading.flex wire:target="selected_container,connectToContainer"')
+ ->not->toContain('wire:loading.flex wire:target="selected_uuid,connectToContainer"')
+ ->and($terminalView)
+ ->toContain("x-on:terminal-starting.window=\"starting = true; setTerminalTheme(localStorage.getItem('coolify-console-theme') ?? 'system')\"")
+ ->toContain('data-auto-start="{{ $autoStart ? \'true\' : \'false\' }}"')
+ ->toContain("starting ? 'connecting…'")
+ ->and($terminalClient)
+ ->toContain('starting: false')
+ ->toContain("this.starting = this.\$el.dataset.autoStart === 'true';");
+ });
+
+ it('starts the global terminal only once when a target is selected', function () {
+ $view = file_get_contents(resource_path('views/livewire/terminal/index.blade.php'));
+ $component = file_get_contents(app_path('Livewire/Terminal/Index.php'));
+
+ expect($view)
+ ->toContain("await \$wire.set('selected_uuid', target.value);")
+ ->not->toContain('await $wire.connectToContainer();')
+ ->and($component)
+ ->toMatch('/public function updatedSelectedUuid\(\).*?\$this->connectToContainer\(\);/s');
+ });
+
+ it('groups global terminal targets by type with labelled sections', function () {
+ $view = file_get_contents(resource_path('views/livewire/terminal/index.blade.php'));
+
+ expect($view)
+ ->toContain('get filteredTargetGroups()')
+ ->toContain("label: 'Servers'")
+ ->toContain("label: 'Containers'")
+ ->toContain('x-for="group in filteredTargetGroups"')
+ ->toContain('x-text="group.label"')
+ ->toContain('x-for="target in group.targets"')
+ ->not->toContain('x-for="target in filteredTargets"');
+ });
+
+ it('uses the redesigned terminal canvas and controls on resource terminal pages', function () {
+ $view = file_get_contents(resource_path('views/livewire/project/shared/execute-container-command.blade.php'));
+
+ expect($view)
+ ->toContain('data-terminal-session-canvas')
+ ->toContain('terminal-session-toolbar absolute top-3 right-3 left-3')
+ ->toContain('terminal-session-panel mt-8')
+ ->toContain('<x-terminal.theme-selector')
+ ->not->toContain('application-console-header flex h-[30px]');
+ });
+
+ it('does not overlay the session expiry label on the application terminal', function () {
+ $terminalView = file_get_contents(resource_path('views/livewire/project/shared/terminal.blade.php'));
+
+ expect($terminalView)
+ ->not->toContain('terminal-session-expiry');
+ });
+
-it('copies the realtime terminal utilities into the container image', function () {
- $dockerfile = file_get_contents(base_path('docker/coolify-realtime/Dockerfile'));
+it('copies the terminal utilities into the Coolify container images', function (string $dockerfile) {
+ $dockerfile = file_get_contents(base_path($dockerfile));
- expect($dockerfile)->toContain('COPY docker/coolify-realtime/terminal-utils.js /terminal/terminal-utils.js');
-});
+ expect($dockerfile)->toContain('COPY docker/coolify-terminal/terminal-utils.js /terminal/terminal-utils.js');
+})->with([
+ 'production image' => 'docker/production/Dockerfile',
+ 'development image' => 'docker/development/Dockerfile',
+]);
it('mounts the realtime terminal utilities in local development compose files', function (string $composeFile) {
$composeContents = file_get_contents(base_path($composeFile));
diff --cc tests/Feature/ReverbAndTerminalPackagingTest.php
index 128c41ede3,0000000000..057b64237c
mode 100644,000000..100644
--- a/tests/Feature/ReverbAndTerminalPackagingTest.php
+++ b/tests/Feature/ReverbAndTerminalPackagingTest.php
@@@ -1,148 -1,0 +1,149 @@@
+<?php
+
+it('uses Reverb as the first-party broadcast server', function () {
+ expect(file_get_contents(base_path('composer.json')))
+ ->toContain('"laravel/reverb"')
+ ->and(file_get_contents(config_path('broadcasting.php')))
+ ->toContain("'default' => env('BROADCAST_CONNECTION', env('BROADCAST_DRIVER', 'reverb'))")
+ ->toContain("'reverb' => [")
+ ->toContain("'key' => env('PUSHER_APP_KEY', 'coolify')")
+ ->toContain("'secret' => env('PUSHER_APP_SECRET', 'coolify')")
+ ->toContain("'app_id' => env('PUSHER_APP_ID', 'coolify')")
+ ->toContain("'host' => env('PUSHER_HOST', 'coolify')")
+ ->toContain("'port' => env('PUSHER_BACKEND_PORT', 6001)")
+ ->and(file_exists(config_path('reverb.php')))->toBeTrue();
+});
+
+it('runs Reverb and terminal websocket services inside the Coolify containers', function (string $dockerfile, string $dependencyService) {
+ $dockerfileContents = file_get_contents(base_path($dockerfile));
+
+ expect($dockerfileContents)
+ ->toContain('nodejs')
+ ->toContain('npm')
+ ->toContain('COPY docker/coolify-terminal/package*.json /terminal/')
+ ->toContain('COPY docker/coolify-terminal/terminal-server.js /terminal/terminal-server.js')
+ ->toContain('COPY docker/coolify-terminal/terminal-utils.js /terminal/terminal-utils.js')
+ ->toContain('npm ci --prefix /terminal')
+ ->and(file_get_contents(base_path(dirname($dockerfile).'/etc/s6-overlay/s6-rc.d/reverb/run')))
+ ->toContain('exec php artisan reverb:start --host=0.0.0.0 --port=${PUSHER_BACKEND_PORT:-6001}')
+ ->and(file_get_contents(base_path(dirname($dockerfile).'/etc/s6-overlay/s6-rc.d/terminal-server/run')))
+ ->toContain('exec node /terminal/terminal-server.js')
+ ->and(file_exists(base_path(dirname($dockerfile)."/etc/s6-overlay/s6-rc.d/reverb/dependencies.d/{$dependencyService}")))->toBeTrue()
+ ->and(file_exists(base_path(dirname($dockerfile)."/etc/s6-overlay/s6-rc.d/terminal-server/dependencies.d/{$dependencyService}")))->toBeTrue()
+ ->and(file_exists(base_path(dirname($dockerfile).'/etc/s6-overlay/s6-rc.d/user/contents.d/reverb')))->toBeTrue()
+ ->and(file_exists(base_path(dirname($dockerfile).'/etc/s6-overlay/s6-rc.d/user/contents.d/terminal-server')))->toBeTrue();
+})->with([
+ 'production image' => ['docker/production/Dockerfile', 'init-script'],
+ 'development image' => ['docker/development/Dockerfile', 'init-setup'],
+]);
+
+it('removes the dedicated realtime service from bundled compose files', function (string $composeFile, bool $hasRuntimeEnvironment) {
+ $composeContents = file_get_contents(base_path($composeFile));
+
+ expect($composeContents)
+ ->not->toContain('coolify-realtime')
+ ->not->toContain('soketi:')
+ ->not->toContain('SOKETI_DEFAULT_APP_ID')
+ ->toContain('6001')
+ ->toContain('6002')
+ ->not->toContain('REVERB_');
+
+ if ($hasRuntimeEnvironment) {
+ expect($composeContents)->toContain('PUSHER_BACKEND_PORT');
+ }
+})->with([
+ 'base compose' => ['docker-compose.yml', false],
+ 'production compose' => ['docker-compose.prod.yml', true],
+ 'development compose' => ['docker-compose.dev.yml', true],
+ 'maxio development compose' => ['docker-compose-maxio.dev.yml', true],
++ 'multi-instance development compose' => ['docker-compose.dev-multi.yml', true],
+ 'windows compose' => ['docker-compose.windows.yml', true],
+]);
+
+it('keeps the internal Reverb listen port separate from the public Pusher port', function () {
+ expect(file_get_contents(config_path('reverb.php')))
+ ->toContain("'port' => env('PUSHER_BACKEND_PORT', 6001)")
+ ->toContain("'port' => env('PUSHER_PORT', 6001)")
+ ->and(file_get_contents(base_path('docker/production/etc/s6-overlay/s6-rc.d/reverb/run')))
+ ->toContain('exec php artisan reverb:start --host=0.0.0.0 --port=${PUSHER_BACKEND_PORT:-6001}')
+ ->and(file_get_contents(base_path('docker/development/etc/s6-overlay/s6-rc.d/reverb/run')))
+ ->toContain('exec php artisan reverb:start --host=0.0.0.0 --port=${PUSHER_BACKEND_PORT:-6001}');
+});
+
+it('proxies Reverb and terminal websocket traffic to the Coolify app container', function () {
+ $serverModel = file_get_contents(app_path('Models/Server.php'));
+
+ expect($serverModel)
+ ->toContain("'rule' => \"Host(`{\$host}`) && PathPrefix(`/app`)\"")
+ ->toContain("'rule' => \"Host(`{\$host}`) && PathPrefix(`/apps`)\"")
+ ->toContain("'rule' => \"Host(`{\$host}`) && PathPrefix(`/terminal/ws`)\"")
+ ->toContain("'url' => 'http://coolify:6001'")
+ ->toContain("'url' => 'http://coolify:6002'")
+ ->toContain('reverse_proxy coolify:6001')
+ ->toContain('reverse_proxy coolify:6002')
+ ->not->toContain('http://coolify-realtime:6001')
+ ->not->toContain('http://coolify-realtime:6002')
+ ->not->toContain('reverse_proxy coolify-realtime');
+});
+
+it('uses Pusher environment keys for self-hosted Reverb compatibility', function () {
+ $files = [
+ '.env.production',
+ '.env.windows-docker-desktop.example',
+ 'docker-compose.prod.yml',
+ 'docker-compose.dev.yml',
+ 'docker-compose-maxio.dev.yml',
+ 'docker-compose.windows.yml',
+ 'scripts/install.sh',
+ 'scripts/upgrade.sh',
+ 'other/nightly/.env.production',
+ 'other/nightly/docker-compose.prod.yml',
+ 'other/nightly/docker-compose.windows.yml',
+ 'other/nightly/install.sh',
+ 'other/nightly/upgrade.sh',
+ ];
+
+ foreach ($files as $file) {
+ expect(file_get_contents(base_path($file)))
+ ->toContain('PUSHER_')
+ ->not->toContain('REVERB_');
+ }
+});
+
+it('defaults the public Pusher websocket port to Reverb instead of the HTTP app port', function () {
+ expect(file_get_contents(base_path('.env.production')))
+ ->not->toContain('PUSHER_PORT=')
+ ->not->toContain('PUSHER_BACKEND_PORT=')
+ ->and(file_get_contents(base_path('.env.windows-docker-desktop.example')))
+ ->toContain('PUSHER_PORT=6001')
+ ->toContain('PUSHER_BACKEND_PORT=6001')
+ ->and(file_get_contents(base_path('scripts/install.sh')))
+ ->toContain('update_env_var "PUSHER_PORT" "6001"')
+ ->toContain('update_env_var "PUSHER_BACKEND_PORT" "6001"')
+ ->toContain('normalize_pusher_port')
+ ->and(file_get_contents(base_path('scripts/upgrade.sh')))
+ ->toContain('update_env_var "PUSHER_PORT" "6001"')
+ ->toContain('update_env_var "PUSHER_BACKEND_PORT" "6001"')
+ ->toContain('normalize_pusher_port');
+});
+
+it('stops publishing or preserving the obsolete realtime image', function () {
+ $productionInstallScript = file_get_contents(base_path('scripts/install.sh'));
+ $nightlyInstallScript = file_get_contents(base_path('other/nightly/install.sh'));
+
+ expect(file_get_contents(config_path('constants.php')))
+ ->not->toContain('realtime_version')
+ ->not->toContain('realtime_image')
+ ->and(file_get_contents(app_path('Actions/Server/CleanupDocker.php')))
+ ->not->toContain('coolify-realtime')
+ ->not->toContain('realtimeImage')
+ ->and(file_get_contents(base_path('versions.json')))
+ ->not->toContain('"realtime"')
+ ->and(is_dir(base_path('docker/coolify-realtime')))->toBeFalse()
+ ->and(file_exists(base_path('.github/workflows/coolify-realtime.yml')))->toBeFalse()
+ ->and(file_exists(base_path('.github/workflows/coolify-realtime-next.yml')))->toBeFalse()
+ ->and($productionInstallScript)->not->toContain('LATEST_REALTIME_VERSION')
+ ->not->toContain('| Realtime')
+ ->and($nightlyInstallScript)->not->toContain('LATEST_REALTIME_VERSION')
+ ->not->toContain('| Realtime');
+});
diff --cc tests/Pest.php
index 81df3649b1,25d9440108..16030dd100
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@@ -30,6 -58,10 +58,9 @@@ beforeEach(function ()
// Flush the Server identity map cache to ensure tests get fresh data
Server::flushIdentityMap();
+
- // Browser Livewire actions often dispatch events; the Soketi host is not
- // resolvable from host-side Pest runs (docker DNS name coolify-realtime).
++ // Browser Livewire actions often dispatch events; disable broadcasting for host-side runs.
+ config(['broadcasting.default' => 'null']);
});
function loginAndSkipBoarding(string $email = '[email protected]', string $password = 'password'): mixed
diff --cc tests/Unit/ProductionImageWorkflowTest.php
index 0000000000,c3b5e665f3..d0d673e1c5
mode 000000,100644..100644
--- a/tests/Unit/ProductionImageWorkflowTest.php
+++ b/tests/Unit/ProductionImageWorkflowTest.php
@@@ -1,0 -1,172 +1,156 @@@
+ <?php
+
+ it('publishes v4 branch builds under the commit sha with a traceable internal version', function () {
+ $workflow = file_get_contents(dirname(__DIR__, 2).'/.github/workflows/coolify-sha-build.yml');
+ $dockerfile = file_get_contents(dirname(__DIR__, 2).'/docker/production/Dockerfile');
+ $constants = file_get_contents(dirname(__DIR__, 2).'/config/constants.php');
+ $versions = json_decode(file_get_contents(dirname(__DIR__, 2).'/versions.json'), true, flags: JSON_THROW_ON_ERROR);
+ $nightlyVersions = json_decode(file_get_contents(dirname(__DIR__, 2).'/other/nightly/versions.json'), true, flags: JSON_THROW_ON_ERROR);
+
+ expect($workflow)
+ ->toContain('name: Build Coolify (SHA)')
+ ->toContain('branches: ["main"]')
+ ->not->toContain('v4.x')
+ ->toContain('short_sha=${GITHUB_SHA::7}')
+ ->toContain('sha-${{ steps.version.outputs.short_sha }}-${{ matrix.arch }}')
+ ->toContain('SHA: ${{ needs.build-push.outputs.short_sha }}')
+ ->not->toContain('sha-${{ github.sha }}')
+ ->toContain('php bootstrap/getVersion.php')
+ ->toContain('version=${BASE_VERSION}-dev.${GITHUB_SHA::9}')
+ ->toContain('COOLIFY_VERSION=${{ steps.version.outputs.version }}')
+ ->not->toContain('IMAGE_NAME }}:latest')
+ ->and($dockerfile)
+ ->toContain('ARG COOLIFY_VERSION')
+ ->toContain('ENV COOLIFY_VERSION=${COOLIFY_VERSION}')
+ ->and($constants)
+ ->toContain("'version' => env('COOLIFY_VERSION') ?: '4.3.9'")
+ ->and($versions['coolify']['v4']['version'])->toBe('4.3.9')
+ ->and($versions['coolify']['nightly']['version'])->toBe('4.3.10')
+ ->and($nightlyVersions)->toBe($versions);
+ });
+
+ it('orders a maintenance development build before its stable release', function () {
+ expect(version_compare('4.3.2-dev.d64cbda3e', '4.3.2', '<'))->toBeTrue()
+ ->and(version_compare('4.3.2', '4.3.2-dev.d64cbda3e', '>'))->toBeTrue();
+ });
+
+ it('requires a reviewed draft release before building a stable version', function () {
+ $workflow = file_get_contents(dirname(__DIR__, 2).'/.github/workflows/coolify-release.yml');
+
+ expect($workflow)
+ ->toContain('name: Release Coolify Stable')
+ ->toContain('run-name: ${{ inputs.tag }}')
+ ->toContain('workflow_dispatch:')
+ ->toContain('tag:')
+ ->toContain("github.ref_name != 'main'")
+ ->toContain('github.paginate(github.rest.repos.listReleases')
+ ->toContain('release.draft')
+ ->toContain('release.prerelease')
+ ->toContain('release.body?.trim()')
+ ->toContain('bootstrap/getVersion.php')
+ ->toContain('target_commitish: context.sha')
+ ->toContain('tag_name: process.env.TAG_NAME')
+ ->toContain('actions/github-script@v8')
+ ->not->toContain('actions/github-script@v7')
+ ->not->toContain('environment: production-release')
+ ->not->toContain('generate-notes');
+ });
+
+ it('runs support image workflows from main', function (string $workflowFile) {
+ $workflow = file_get_contents(dirname(__DIR__, 2)."/.github/workflows/{$workflowFile}");
+
+ expect($workflow)
+ ->toContain('branches: [ "main" ]')
+ ->not->toContain('v4.x');
+ })->with([
+ 'helper' => 'coolify-helper.yml',
- 'realtime' => 'coolify-realtime.yml',
+ ]);
+
+ it('prevents the stable helper workflow from publishing an existing version', function () {
+ $workflow = file_get_contents(dirname(__DIR__, 2).'/.github/workflows/coolify-helper.yml');
+
+ expect($workflow)
+ ->toContain('check-version:')
+ ->toContain('needs: check-version')
+ ->toContain('VERSION="${BASE_VERSION}"')
+ ->toContain('docker buildx imagetools inspect "$IMAGE"')
+ ->toContain('Version $VERSION already exists in $registry')
+ ->toContain('Version $VERSION is available in both registries')
+ ->toContain('Could not verify $IMAGE')
+ ->toContain('cancel-in-progress: false');
+ });
+
-it('prevents the stable realtime workflow from publishing an existing version', function () {
- $workflow = file_get_contents(dirname(__DIR__, 2).'/.github/workflows/coolify-realtime.yml');
-
- expect($workflow)
- ->toContain('check-version:')
- ->toContain('needs: check-version')
- ->toContain('php bootstrap/getRealtimeVersion.php')
- ->toContain('VERSION="${BASE_VERSION}"')
- ->toContain('docker buildx imagetools inspect "$IMAGE"')
- ->toContain('Version $VERSION already exists in $registry')
- ->toContain('Version $VERSION is available in both registries')
- ->toContain('Could not verify $IMAGE')
- ->toContain('cancel-in-progress: false');
-});
-
+ it('generates the production changelog from main', function () {
+ $workflow = file_get_contents(dirname(__DIR__, 2).'/.github/workflows/generate-changelog.yml');
+
+ expect($workflow)
+ ->toContain('branches: [ main ]')
+ ->not->toContain('v4.x');
+ });
+
+ it('excludes main from staging builds', function () {
+ $workflow = file_get_contents(dirname(__DIR__, 2).'/.github/workflows/coolify-staging-build.yml');
+
+ expect($workflow)
+ ->toContain(' - main')
+ ->not->toContain(' - v4.x');
+ });
+
+ it('rebuilds stable images and publishes the reviewed draft after both architectures succeed', function () {
+ $workflow = file_get_contents(dirname(__DIR__, 2).'/.github/workflows/coolify-release.yml');
+
+ expect($workflow)
+ ->toContain('docker/build-push-action@v6')
+ ->toContain('COOLIFY_VERSION=${{ needs.validate.outputs.version }}')
+ ->toContain('release-${{ needs.validate.outputs.version }}-${{ github.sha }}-${{ matrix.arch }}')
+ ->toContain('--tag "${IMAGE}:${VERSION}"')
+ ->toContain('--tag "${IMAGE}:latest"')
+ ->toContain('github.rest.repos.getRelease')
+ ->toContain('release.target_commitish !== context.sha')
+ ->toContain('release_id: Number(process.env.RELEASE_ID)')
+ ->toContain('draft: false')
+ ->toContain('permissions: {}')
+ ->not->toContain('sarisia/actions-status-discord@v1')
+ ->not->toContain('SOURCE_TAG="sha-${RELEASE_SHA}"');
+ });
+
+ it('documents the production, rc, and hotfix release flows', function () {
+ $releaseGuide = file_get_contents(dirname(__DIR__, 2).'/RELEASE.md');
+
+ expect($releaseGuide)
+ ->toContain('| `main` | Latest production source |')
+ ->toContain('| `next` | Feature integration and RC releases |')
+ ->toContain('| `hotfix/X.Y.Z` | Production fixes based on `main` |')
+ ->toContain('feature/* → next → RC')
+ ->toContain('next → main → stable release')
+ ->toContain('main → hotfix/X.Y.Z → main → next')
+ ->toContain('reviewed draft GitHub Release')
+ ->toContain('workflows never edit or commit versions')
+ ->toContain('Update the CDN only after the release is approved')
+ ->not->toContain('`edge`')
+ ->not->toContain('promotes the existing SHA image');
+ });
+
+ it('documents pull request targets for fixes and features', function () {
+ $contributingGuide = file_get_contents(dirname(__DIR__, 2).'/CONTRIBUTING.md');
+
+ expect($contributingGuide)
+ ->toContain('Fixes and small improvements')
+ ->toContain('target `main`')
+ ->toContain('New features and larger changes')
+ ->toContain('target `next`')
+ ->toContain('branch from `main`')
+ ->toContain('branch from `next`')
+ ->not->toContain('All pull requests must target the `next` branch');
+ });
+
+ it('guides issue authors to the correct contribution branch', function () {
+ $bugReport = file_get_contents(dirname(__DIR__, 2).'/.github/ISSUE_TEMPLATE/01_BUG_REPORT.yml');
+ $issueConfig = file_get_contents(dirname(__DIR__, 2).'/.github/ISSUE_TEMPLATE/config.yml');
+
+ expect($bugReport)
+ ->toContain('branch from `main` and target `main`')
+ ->and($issueConfig)
+ ->toContain('Feature code should branch from `next` and target `next`')
+ ->toContain('Small fixes should target `main`; larger changes should target `next`');
+ });
diff --cc versions.json
index b483549167,92a88ea023..d868ff224e
--- a/versions.json
+++ b/versions.json
@@@ -1,16 -1,19 +1,16 @@@
{
"coolify": {
"v4": {
- "version": "4.1.2"
+ "version": "4.3.9"
},
"nightly": {
- "version": "4.2.0"
+ "version": "4.3.10"
},
"helper": {
- "version": "1.0.14"
+ "version": "1.0.15"
},
- "realtime": {
- "version": "1.0.17"
- },
"sentinel": {
- "version": "0.0.21"
+ "version": "0.0.22"
}
},
"traefik": {