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.

fix(terminal): distinguish containers across servers

Andras Bacsaie82843ac3979
diff --git a/app/Livewire/Terminal/Index.php b/app/Livewire/Terminal/Index.php
index 6bb4c5e908..116db1eed1 100644
--- a/app/Livewire/Terminal/Index.php
+++ b/app/Livewire/Terminal/Index.php
@@ -47,7 +47,7 @@ class Index extends Component
return [
'name' => data_get($container, 'Names'),
'connection_name' => data_get($container, 'Names'),
- 'uuid' => data_get($container, 'Names'),
+ 'uuid' => $server->uuid.':'.data_get($container, 'Names'),
'status' => data_get_str($container, 'State')->lower(),
'server' => $server,
'server_uuid' => $server->uuid,
diff --git a/config/constants.php b/config/constants.php
index a406dd0ea7..ca05db48f4 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
return [
'coolify' => [
- 'version' => env('COOLIFY_VERSION') ?: '4.3.10',
+ 'version' => env('COOLIFY_VERSION') ?: '4.3.11',
'helper_version' => '1.0.15',
'realtime_version' => '1.0.17',
'railpack_version' => '0.23.0',
diff --git a/other/nightly/versions.json b/other/nightly/versions.json
index 440ad36160..d4e5b5c8c9 100644
--- a/other/nightly/versions.json
+++ b/other/nightly/versions.json
@@ -1,7 +1,7 @@
{
"coolify": {
"v4": {
- "version": "4.3.10"
+ "version": "4.3.11"
},
"nightly": {
"version": "4.4-rc.1"
diff --git a/tests/Feature/TerminalContainerListTest.php b/tests/Feature/TerminalContainerListTest.php
new file mode 100644
index 0000000000..ec64da51c9
--- /dev/null
+++ b/tests/Feature/TerminalContainerListTest.php
@@ -0,0 +1,39 @@
+<?php
+
+use App\Livewire\Terminal\Index;
+use App\Models\Server;
+use Illuminate\Support\Collection;
+
+function terminalServer(string $uuid, string $name, array $containers): Server
+{
+ $server = Mockery::mock(Server::class)->makePartial();
+ $server->forceFill(['uuid' => $uuid, 'name' => $name]);
+ $server->shouldReceive('isFunctional')->once()->andReturnTrue();
+ $server->shouldReceive('loadAllContainers')->once()->andReturn(collect($containers));
+
+ return $server;
+}
+
+it('keeps containers with the same name on different servers as distinct terminal targets', function () {
+ $component = new Index;
+ $component->servers = new Collection([
+ terminalServer('pulse-uuid', 'Pulse', [
+ ['Names' => 'coolify-proxy', 'State' => 'running'],
+ ['Names' => 'coolify-sentinel', 'State' => 'running'],
+ ]),
+ terminalServer('forge-uuid', 'Forge', [
+ ['Names' => 'coolify-proxy', 'State' => 'running'],
+ ['Names' => 'coolify-sentinel', 'State' => 'running'],
+ ]),
+ ]);
+
+ $component->loadContainers();
+
+ expect($component->containers)->toHaveCount(4)
+ ->and(collect($component->containers)->pluck('uuid')->all())->toBe([
+ 'pulse-uuid:coolify-proxy',
+ 'forge-uuid:coolify-proxy',
+ 'pulse-uuid:coolify-sentinel',
+ 'forge-uuid:coolify-sentinel',
+ ]);
+});
diff --git a/tests/Unit/ProductionImageWorkflowTest.php b/tests/Unit/ProductionImageWorkflowTest.php
index 659d233122..2fafa678e8 100644
--- a/tests/Unit/ProductionImageWorkflowTest.php
+++ b/tests/Unit/ProductionImageWorkflowTest.php
@@ -23,8 +23,8 @@ it('publishes v4 branch builds under the commit sha with a traceable internal ve
->toContain('ARG COOLIFY_VERSION')
->toContain('ENV COOLIFY_VERSION=${COOLIFY_VERSION}')
->and($constants)
- ->toContain("'version' => env('COOLIFY_VERSION') ?: '4.3.10'")
- ->and($versions['coolify']['v4']['version'])->toBe('4.3.10')
+ ->toContain("'version' => env('COOLIFY_VERSION') ?: '4.3.11'")
+ ->and($versions['coolify']['v4']['version'])->toBe('4.3.11')
->and($versions['coolify']['nightly']['version'])->toBe('4.4-rc.1')
->and($nightlyVersions)->toBe($versions);
});
diff --git a/versions.json b/versions.json
index 440ad36160..d4e5b5c8c9 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
{
"coolify": {
"v4": {
- "version": "4.3.10"
+ "version": "4.3.11"
},
"nightly": {
"version": "4.4-rc.1"