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

refactor(database): remove volume_configuration_dir and streamline configuration directory usage in MongoDB and PostgreSQL handlers

Browse source
This commit is contained in:
Andras Bacsai 2025-09-10 16:12:53 +02:00
parent 48d3b3d263
commit 1c08d32b85
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Actions/Database/StartMongodb.php
View file

@ -18,8 +18,6 @@ class StartMongodb
public string $configuration_dir; public string $configuration_dir;
public string $volume_configuration_dir;
private ?SslCertificate $ssl_certificate = null; private ?SslCertificate $ssl_certificate = null;
public function handle(StandaloneMongodb $database) public function handle(StandaloneMongodb $database)
@ -29,10 +27,7 @@ public function handle(StandaloneMongodb $database)
$startCommand = 'mongod'; $startCommand = 'mongod';
$container_name = $this->database->uuid; $container_name = $this->database->uuid;
$this->volume_configuration_dir = $this->configuration_dir = database_configuration_dir().'/'.$container_name; $this->configuration_dir = database_configuration_dir().'/'.$container_name;
if (isDev()) {
$this->volume_configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$container_name;
}
$this->commands = [ $this->commands = [
"echo 'Starting database.'", "echo 'Starting database.'",
@ -178,7 +173,7 @@ public function handle(StandaloneMongodb $database)
$docker_compose['services'][$container_name]['volumes'] ?? [], $docker_compose['services'][$container_name]['volumes'] ?? [],
[[ [[
'type' => 'bind', 'type' => 'bind',
'source' => $this->volume_configuration_dir.'/mongod.conf', 'source' => $this->configuration_dir.'/mongod.conf',
'target' => '/etc/mongo/mongod.conf', 'target' => '/etc/mongo/mongod.conf',
'read_only' => true, 'read_only' => true,
]] ]]
@ -192,7 +187,7 @@ public function handle(StandaloneMongodb $database)
$docker_compose['services'][$container_name]['volumes'] ?? [], $docker_compose['services'][$container_name]['volumes'] ?? [],
[[ [[
'type' => 'bind', 'type' => 'bind',
'source' => $this->volume_configuration_dir.'/docker-entrypoint-initdb.d', 'source' => $this->configuration_dir.'/docker-entrypoint-initdb.d',
'target' => '/docker-entrypoint-initdb.d', 'target' => '/docker-entrypoint-initdb.d',
'read_only' => true, 'read_only' => true,
]] ]]
@ -259,7 +254,7 @@ public function handle(StandaloneMongodb $database)
$this->commands[] = [ $this->commands[] = [
'transfer_file' => [ 'transfer_file' => [
'content' => $docker_compose, 'content' => $docker_compose,
'destination' => "$this->volume_configuration_dir/docker-compose.yml", 'destination' => "$this->configuration_dir/docker-compose.yml",
], ],
]; ];
$readme = generate_readme_file($this->database->name, now()); $readme = generate_readme_file($this->database->name, now());

12
app/Actions/Database/StartPostgresql.php
View file

@ -20,8 +20,6 @@ class StartPostgresql
public string $configuration_dir; public string $configuration_dir;
public string $volume_configuration_dir;
private ?SslCertificate $ssl_certificate = null; private ?SslCertificate $ssl_certificate = null;
public function handle(StandalonePostgresql $database) public function handle(StandalonePostgresql $database)
@ -29,10 +27,6 @@ public function handle(StandalonePostgresql $database)
$this->database = $database; $this->database = $database;
$container_name = $this->database->uuid; $container_name = $this->database->uuid;
$this->configuration_dir = database_configuration_dir().'/'.$container_name; $this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->volume_configuration_dir = $this->configuration_dir;
if (isDev()) {
$this->volume_configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$container_name;
}
$this->commands = [ $this->commands = [
"echo 'Starting database.'", "echo 'Starting database.'",
@ -195,7 +189,7 @@ public function handle(StandalonePostgresql $database)
$docker_compose['services'][$container_name]['volumes'], $docker_compose['services'][$container_name]['volumes'],
[[ [[
'type' => 'bind', 'type' => 'bind',
'source' => $this->volume_configuration_dir.'/custom-postgres.conf', 'source' => $this->configuration_dir.'/custom-postgres.conf',
'target' => '/etc/postgresql/postgresql.conf', 'target' => '/etc/postgresql/postgresql.conf',
'read_only' => true, 'read_only' => true,
]] ]]
@ -223,7 +217,7 @@ public function handle(StandalonePostgresql $database)
$this->commands[] = [ $this->commands[] = [
'transfer_file' => [ 'transfer_file' => [
'content' => $docker_compose, 'content' => $docker_compose,
'destination' => "$this->volume_configuration_dir/docker-compose.yml", 'destination' => "$this->configuration_dir/docker-compose.yml",
], ],
]; ];
$readme = generate_readme_file($this->database->name, now()); $readme = generate_readme_file($this->database->name, now());
@ -236,6 +230,8 @@ public function handle(StandalonePostgresql $database)
} }
$this->commands[] = "echo 'Database started.'"; $this->commands[] = "echo 'Database started.'";
ray($this->commands);
return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged'); return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
} }