starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-11-06 13:10:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(compose): allow upgrades with legacy soketi overrides

Browse Source 
Add an inactive soketi placeholder to production and nightly Compose
files so old custom overrides remain valid without starting soketi.
Cover partial and full legacy overrides with regression tests.
This commit is contained in:
Andras Bacsai
2026-10-06 11:29:33 +02:00
parent 116806df1b
commit e79347295a
3 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.prod.yml
+7
View File
@@ -1,4 +1,11 @@
services:
# Placeholder for "soketi" overrides in docker-compose.custom.yml from versions before 4.4.
# Realtime runs inside the coolify container now. Without this entry, such an override is an
# incomplete service and every upgrade fails; the inactive profile means it never starts.
soketi:
image: busybox:1.37
profiles:
- legacy-soketi
coolify:
image: "${REGISTRY_URL:-docker.io}/coollabsio/coolify:${LATEST_IMAGE:-latest}"
volumes:
other/nightly/docker-compose.prod.yml
+7
View File
@@ -1,4 +1,11 @@
services:
# Placeholder for "soketi" overrides in docker-compose.custom.yml from versions before 4.4.
# Realtime runs inside the coolify container now. Without this entry, such an override is an
# incomplete service and every upgrade fails; the inactive profile means it never starts.
soketi:
image: busybox:1.37
profiles:
- legacy-soketi
coolify:
image: "${REGISTRY_URL:-docker.io}/coollabsio/coolify:${LATEST_IMAGE:-latest}"
volumes:
tests/Feature/ReverbAndTerminalPackagingTest.php
+32 -2
View File
@@ -1,8 +1,11 @@
<?php
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Process;
use Illuminate\Support\Facades\Request as RequestFacade;
use Illuminate\Support\Str;
use Symfony\Component\Process\ExecutableFinder;
use Symfony\Component\Yaml\Yaml;
it('uses Reverb as the first-party broadcast server', function () {
@@ -119,12 +122,14 @@ it('runs Reverb and terminal websocket services inside the Coolify containers',
it('removes the dedicated realtime service from bundled compose files', function (string $composeFile, bool $hasRuntimeEnvironment) {
$composeContents = file_get_contents(base_path($composeFile));
$soketi = Yaml::parse($composeContents)['services']['soketi'] ?? null;
// Production keeps "coolify-realtime" only as a network alias of the coolify container.
// Production keeps "coolify-realtime" only as a network alias of the coolify container, and "soketi"
// only as an inactive placeholder for old overrides in docker-compose.custom.yml.
expect($soketi === null || array_keys($soketi) === ['image', 'profiles'])->toBeTrue();
expect($composeContents)
->not->toContain('container_name: coolify-realtime')
->not->toContain('coolify-realtime:')
->not->toContain('soketi:')
->not->toContain('SOKETI_DEFAULT_APP_ID')
->toContain('6001')
->toContain('6002')
@@ -304,3 +309,28 @@ it('uses current Reverb and terminal names in development tooling', function ()
->toContain('FORWARD_TERMINAL_PORT')
->not->toContain('SOKETI');
});
it('accepts a soketi override from 4.3.23 in docker-compose.custom.yml without starting soketi', function (string $composeFile, string $override) {
if (! (new ExecutableFinder)->find('docker')) {
$this->markTestSkipped('Docker is not installed.');
}
$directory = sys_get_temp_dir().'/coolify-soketi-override-'.Str::random(8);
mkdir($directory);
copy(base_path('docker-compose.yml'), "{$directory}/docker-compose.yml");
copy(base_path($composeFile), "{$directory}/docker-compose.prod.yml");
file_put_contents("{$directory}/docker-compose.custom.yml", $override);
try {
$result = Process::path($directory)->run('docker compose -f docker-compose.yml -f docker-compose.prod.yml -f docker-compose.custom.yml config --services');
} finally {
File::deleteDirectory($directory);
}
expect($result->successful())->toBeTrue($result->errorOutput())
->and(array_filter(explode("\n", trim($result->output()))))->not->toContain('soketi')
->toContain('coolify');
})->with([
'production compose, partial override' => ['docker-compose.prod.yml', "services:\n soketi:\n environment:\n SOKETI_DEBUG: 'true'\n ports:\n - '6001:6001'\n"],
'production compose, full service' => ['docker-compose.prod.yml', "services:\n soketi:\n image: quay.io/soketi/soketi:1.6-16-alpine\n container_name: coolify-realtime\n ports:\n - '6001:6001'\n"],
'nightly production compose, partial override' => ['other/nightly/docker-compose.prod.yml', "services:\n soketi:\n environment:\n SOKETI_DEBUG: 'true'\n"],
]);