8d280b4aac
When port mappings are changed in the UI and the database is restarted, the system now gracefully stops and removes the existing container before recreating it with the new configuration. This prevents the "container name already in use" error that occurred when Docker Compose tried to create a container with the same name but different port configuration. Changes: - Add graceful container stop (10s timeout) before docker compose up - Remove old container to avoid name conflicts - Use --timeout flag (modern Docker CLI) instead of deprecated --time - Apply fix to all database types: MariaDB, MySQL, PostgreSQL, MongoDB, Redis, KeyDB, Dragonfly, and ClickHouse - Update StopDatabase.php for consistency 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
56 lines
1.7 KiB
PHP
56 lines
1.7 KiB
PHP
<?php
|
|
|
|
namespace App\Actions\Database;
|
|
|
|
use App\Actions\Server\CleanupDocker;
|
|
use App\Events\ServiceStatusChanged;
|
|
use App\Models\StandaloneClickhouse;
|
|
use App\Models\StandaloneDragonfly;
|
|
use App\Models\StandaloneKeydb;
|
|
use App\Models\StandaloneMariadb;
|
|
use App\Models\StandaloneMongodb;
|
|
use App\Models\StandaloneMysql;
|
|
use App\Models\StandalonePostgresql;
|
|
use App\Models\StandaloneRedis;
|
|
use Lorisleiva\Actions\Concerns\AsAction;
|
|
|
|
class StopDatabase
|
|
{
|
|
use AsAction;
|
|
|
|
public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $database, bool $dockerCleanup = true)
|
|
{
|
|
try {
|
|
$server = $database->destination->server;
|
|
if (! $server->isFunctional()) {
|
|
return 'Server is not functional';
|
|
}
|
|
|
|
$this->stopContainer($database, $database->uuid, 30);
|
|
|
|
if ($dockerCleanup) {
|
|
CleanupDocker::dispatch($server, false, false);
|
|
}
|
|
|
|
if ($database->is_public) {
|
|
StopDatabaseProxy::run($database);
|
|
}
|
|
|
|
return 'Database stopped successfully';
|
|
} catch (\Exception $e) {
|
|
return 'Database stop failed: '.$e->getMessage();
|
|
} finally {
|
|
ServiceStatusChanged::dispatch($database->environment->project->team->id);
|
|
}
|
|
|
|
}
|
|
|
|
private function stopContainer($database, string $containerName, int $timeout = 30): void
|
|
{
|
|
$server = $database->destination->server;
|
|
instant_remote_process(command: [
|
|
"docker stop --timeout=$timeout $containerName",
|
|
"docker rm -f $containerName",
|
|
], server: $server, throwError: false);
|
|
}
|
|
}
|