rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(terminal): distinguish application containers across servers

Browse source
This commit is contained in:
peaklabs-dev 2026-09-08 19:43:05 +02:00
parent 1e8a27b084
commit d25edb8551
No known key found for this signature in database
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Livewire/Project/Shared/ExecuteContainerCommand.php
View file

@ -151,13 +151,18 @@ public function loadContainers(): void
});
if ($this->containers->count() === 1) {
$this->selected_container = data_get($this->containers->first(), 'container.Names');
$this->selected_container = $this->containerTarget($this->containers->first());
$this->connectToContainer();
}
$this->containersLoaded = true;
}
private function containerTarget(array $container): string
{
return data_get($container, 'server.uuid').':'.data_get($container, 'container.Names');
}
public function updatedSelectedContainer()
{
if ($this->selected_container !== 'default') {
@ -202,12 +207,12 @@ public function connectToContainer()
try {
$this->authorize('canAccessTerminal');
// Validate container name format
if (! ValidationPatterns::isValidContainerName($this->selected_container)) {
if (! ValidationPatterns::isValidContainerName(str($this->selected_container)->after(':')->value())) {
throw new \InvalidArgumentException('Invalid container name format');
}
// Verify container exists in our allowed list
$container = collect($this->containers)->firstWhere('container.Names', $this->selected_container);
$container = $this->containers->first(fn ($candidate) => $this->containerTarget($candidate) === $this->selected_container);
if (is_null($container)) {
throw new \RuntimeException('Container not found.');
}

2
resources/views/livewire/project/shared/execute-container-command.blade.php
View file

@ -34,7 +34,7 @@
$consoleThemeNames = collect($consoleThemes)->pluck('name', 'key');
$consoleThemeAccents = collect($consoleThemes)->pluck('accent', 'key');
$containerOptions = $containers->map(fn ($container) => [
'value' => data_get($container, 'container.Names'),
'value' => data_get($container, 'server.uuid').':'.data_get($container, 'container.Names'),
'label' => data_get($container, 'container.Names').' · '.data_get($container, 'server.name'),
])->values();
@endphp