Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Add port mappings for postgresql

Browse Source 
Able to add init scripts fro postgresql
This commit is contained in:
Andras Bacsai 2023-08-08 14:35:01 +02:00
parent f2228cec7b
commit bd9a1dbaf3
12 changed files with 260 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
app/Actions/Database/StartPostgresql.php
View File

@ -9,30 +9,36 @@ use Symfony\Component\Yaml\Yaml;
class StartPostgresql
{
public $database;
public StandalonePostgresql $database;
public array $commands = [];
public array $init_scripts = [];
public string $base_dir;
public function __invoke(Server $server, StandalonePostgresql $database)
{
$this->database = $database;
$container_name = generate_container_name($this->database->uuid);
$destination = $this->database->destination;
$image = $this->database->image;
$this->base_dir = '/data/coolify/databases/' . $container_name;
$this->commands = [
"mkdir -p $this->base_dir",
"mkdir -p $this->base_dir/docker-entrypoint-initdb.d/"
];
$persistent_storages = $this->generate_local_persistent_volumes();
$volume_names = $this->generate_local_persistent_volumes_only_volume_names();
$environment_variables = $this->generate_environment_variables();
$this->generate_init_scripts();
$docker_compose = [
'version' => '3.8',
'services' => [
$container_name => [
'image' => $image,
'image' => $this->database->image,
'container_name' => $container_name,
'environment' => $environment_variables,
'restart' => 'always',
'networks' => [
$destination->network,
$this->database->destination->network,
],
'healthcheck' => [
'test' => [
@ -58,29 +64,37 @@ class StartPostgresql
]
],
'networks' => [
$destination->network => [
$this->database->destination->network => [
'external' => false,
'name' => $destination->network,
'name' => $this->database->destination->network,
'attachable' => true,
]
]
];
if (count($this->database->ports_mappings_array) > 0) {
$docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
}
if (count($persistent_storages) > 0) {
$docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
}
if (count($volume_names) > 0) {
$docker_compose['volumes'] = $volume_names;
}
if (count($this->init_scripts) > 0) {
foreach ($this->init_scripts as $init_script) {
$docker_compose['services'][$container_name]['volumes'][] = [
'type' => 'bind',
'source' => $init_script,
'target' => '/docker-entrypoint-initdb.d/' . basename($init_script),
'read_only' => true,
];
}
}
$docker_compose = Yaml::dump($docker_compose, 10);
$docker_compose_base64 = base64_encode($docker_compose);
$activity = remote_process([
"mkdir -p /tmp/{$container_name}",
"echo '{$docker_compose_base64}' | base64 -d > /tmp/{$container_name}/docker-compose.yml",
"docker compose -f /tmp/{$container_name}/docker-compose.yml up -d",
], $server);
return $activity;
$this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->base_dir/docker-compose.yml";
$this->commands[] = "docker compose -f $this->base_dir/docker-compose.yml up -d";
return remote_process($this->commands, $server);
}
private function generate_local_persistent_volumes()
@ -131,4 +145,18 @@ class StartPostgresql
}
return $environment_variables->all();
}
private function generate_init_scripts()
{
if (count($this->database->init_scripts) === 0) {
return;
}
foreach ($this->database->init_scripts as $init_script) {
$filename = data_get($init_script, 'filename');
$content = data_get($init_script, 'content');
$content_base64 = base64_encode($content);
$this->commands[] = "echo '{$content_base64}' | base64 -d > $this->base_dir/docker-entrypoint-initdb.d/{$filename}";
$this->init_scripts[] = "$this->base_dir/docker-entrypoint-initdb.d/{$filename}";
}
}
}

1
app/Http/Controllers/DatabaseController.php
View File

@ -23,7 +23,6 @@ class DatabaseController extends Controller
if (!$database) {
return redirect()->route('dashboard');
}
ray($database->persistentStorages()->get());
return view('project.database.configuration', ['database' => $database]);
}
}

47
app/Http/Livewire/Project/Database/InitScript.php Normal file
View File

@ -0,0 +1,47 @@
<?php
namespace App\Http\Livewire\Project\Database;
use Livewire\Component;
class InitScript extends Component
{
public array $script;
public int $index;
public string|null $filename;
public string|null $content;
protected $rules = [
'filename' => 'required|string',
'content' => 'required|string',
];
protected $validationAttributes = [
'filename' => 'Filename',
'content' => 'Content',
];
public function mount()
{
$this->index = data_get($this->script, 'index');
$this->filename = data_get($this->script, 'filename');
$this->content = data_get($this->script, 'content');
}
public function submit()
{
$this->validate();
try {
$this->script['index'] = $this->index;
$this->script['content'] = $this->content;
$this->script['filename'] = $this->filename;
$this->emitUp('save_init_script', $this->script);
} catch (Exception $e) {
return general_error_handler(err: $e, that: $this);
}
}
public function delete()
{
$this->emitUp('delete_init_script', $this->script);
}
}

60
app/Http/Livewire/Project/Database/Postgresql/General.php
View File

@ -2,12 +2,18 @@
namespace App\Http\Livewire\Project\Database\Postgresql;
use App\Models\StandalonePostgresql;
use Exception;
use Livewire\Component;
use function Aws\filter;
class General extends Component
{
public $database;
protected $listeners = ['refresh'];
public StandalonePostgresql $database;
public string $new_filename;
public string $new_content;
protected $listeners = ['refresh', 'save_init_script', 'delete_init_script'];
protected $rules = [
'database.name' => 'required',
@ -19,6 +25,7 @@ class General extends Component
'database.postgres_host_auth_method' => 'nullable',
'database.init_scripts' => 'nullable',
'database.image' => 'required',
'database.ports_mappings' => 'nullable',
];
protected $validationAttributes = [
'database.name' => 'Name',
@ -30,20 +37,67 @@ class General extends Component
'database.postgres_host_auth_method' => 'Postgres Host Auth Method',
'database.init_scripts' => 'Init Scripts',
'database.image' => 'Image',
'database.ports_mappings' => 'Port Mapping',
];
public function save_init_script($script)
{
$this->database->init_scripts = filter($this->database->init_scripts, fn($s) => $s['filename'] !== $script['filename']);
$this->database->init_scripts = array_merge($this->database->init_scripts, [$script]);
$this->database->save();
$this->emit('success', 'Init script saved successfully.');
}
public function delete_init_script($script)
{
$collection = collect($this->database->init_scripts);
$found = $collection->firstWhere('filename', $script['filename']);
if ($found) {
ray($collection->filter(fn($s) => $s['filename'] !== $script['filename'])->toArray());
$this->database->init_scripts = $collection->filter(fn($s) => $s['filename'] !== $script['filename'])->toArray();
$this->database->save();
$this->refresh();
$this->emit('success', 'Init script deleted successfully.');
return;
}
}
public function refresh(): void
{
$this->database->refresh();
}
public function save_new_init_script()
{
$this->validate([
'new_filename' => 'required|string',
'new_content' => 'required|string',
]);
$found = collect($this->database->init_scripts)->firstWhere('filename', $this->new_filename);
if ($found) {
$this->emit('error', 'Filename already exists.');
return;
}
$this->database->init_scripts = array_merge($this->database->init_scripts, [
[
'index' => count($this->database->init_scripts),
'filename' => $this->new_filename,
'content' => $this->new_content,
]
]);
$this->database->save();
$this->emit('success', 'Init script added successfully.');
$this->new_content = '';
$this->new_filename = '';
}
public function submit()
{
try {
$this->validate();
$this->database->save();
$this->emit('success', 'Database updated successfully.');
} catch (\Exception $e) {
} catch (Exception $e) {
return general_error_handler(err: $e, that: $this);
}
}

21
app/Models/StandalonePostgresql.php
View File

@ -2,6 +2,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
@ -11,6 +12,7 @@ class StandalonePostgresql extends BaseModel
protected $guarded = [];
protected $casts = [
'init_scripts' => 'array',
'postgres_password' => 'encrypted',
];
@ -28,6 +30,25 @@ class StandalonePostgresql extends BaseModel
});
}
public function portsMappings(): Attribute
{
return Attribute::make(
set: fn($value) => $value === "" ? null : $value,
);
}
// Normal Deployments
public function portsMappingsArray(): Attribute
{
return Attribute::make(
get: fn() => is_null($this->ports_mappings)
? []
: explode(',', $this->ports_mappings),
);
}
public function type()
{
return 'standalone-postgresql';

2
app/View/Components/Forms/Textarea.php
View File

@ -24,7 +24,7 @@ class Textarea extends Component
public bool $disabled = false,
public bool $readonly = false,
public string|null $helper = null,
public string $defaultClass = "textarea bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none"
public string $defaultClass = "textarea bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500"
)
{
//

21
database/migrations/2023_08_08_114038_add_port_mappings_to_standalone_postgresqls.php Normal file
View File

@ -0,0 +1,21 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
public function up(): void
{
Schema::table('standalone_postgresqls', function (Blueprint $table) {
$table->text('ports_mappings')->nullable();
});
}
public function down(): void
{
Schema::table('standalone_postgresqls', function (Blueprint $table) {
$table->dropColumn('ports_mappings');
});
}
};

10
database/seeders/StandalonePostgresqlSeeder.php
View File

@ -8,9 +8,6 @@ use Illuminate\Database\Seeder;
class StandalonePostgresqlSeeder extends Seeder
{
/**
* Run the database seeds.
*/
public function run(): void
{
StandalonePostgresql::create([
@ -20,6 +17,13 @@ class StandalonePostgresqlSeeder extends Seeder
'environment_id' => 1,
'destination_id' => 1,
'destination_type' => StandaloneDocker::class,
'init_scripts' => [
[
'index' => 0,
'filename' => 'init_test_db.sql',
'content' => 'CREATE DATABASE test;'
]
]
]);
}
}

3
resources/views/components/forms/textarea.blade.php
View File

@ -29,7 +29,8 @@
</span>
</label>
@endif
<textarea {{ $attributes->merge(['class' => $defaultClass]) }} @required($required) wire:model.defer={{ $id }}
<textarea placeholder="{{$placeholder}}"
{{ $attributes->merge(['class' => $defaultClass]) }} @required($required) wire:model.defer={{ $id }}
@disabled($disabled) id="{{ $id }}" name="{{ $name }}" name={{ $id }}
wire:model.defer={{ $value ?? $id }} wire:dirty.class="input-warning"></textarea>
@error($id)

2
resources/views/livewire/activity-monitor.blade.php
View File

@ -14,8 +14,6 @@
<pre class="font-mono whitespace-pre-wrap"
@if ($isPollingActive) wire:poll.2000ms="polling" @endif>{{ RunRemoteProcess::decodeOutput($this->activity) }}</pre>
{{-- @else
<pre class="whitespace-pre-wrap">Output will be here...</pre> --}}
</div>
@endif
</div>

10
resources/views/livewire/project/database/init-script.blade.php Normal file
View File

@ -0,0 +1,10 @@
<div>
<form wire:submit.prevent="submit">
<div class="flex gap-2 items-end">
<x-forms.input id="filename" label="Filename"/>
<x-forms.button type="submit">Save</x-forms.button>
<x-forms.button isError wire:click.prevent="delete">Delete</x-forms.button>
</div>
<x-forms.textarea id="content" label="Content"/>
</form>
</div>

56
resources/views/livewire/project/database/postgresql/general.blade.php
View File

@ -1,4 +1,18 @@
<div>
<dialog id="newInitScript" class="modal">
<form method="dialog" class="flex flex-col gap-2 rounded modal-box" wire:submit.prevent='save_new_init_script'>
<h3 class="text-lg font-bold">Add Init Script</h3>
<x-forms.input placeholder="create_test_db.sql" id="new_filename" label="Filename" required/>
<x-forms.textarea placeholder="CREATE DATABASE test;" id="new_content" label="Content" required/>
<x-forms.button onclick="newInitScript.close()" type="submit">
Save
</x-forms.button>
</form>
<form method="dialog" class="modal-backdrop">
<button>close</button>
</form>
</dialog>
<form wire:submit.prevent="submit" class="flex flex-col gap-2">
<div class="flex items-center gap-2">
<h2>General</h2>
@ -11,28 +25,50 @@
<x-forms.input label="Description" id="database.description"/>
<x-forms.input label="Image" id="database.image" required
helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/postgres'>https://hub.docker.com/_/postgres</a>"/>
<x-forms.input placeholder="3000:3000" id="database.ports_mappings" label="Ports Mappings"
helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.<br><span class='inline-block font-bold text-warning'>Example</span>3000:3000,3002:3002"/>
</div>
<div class="flex gap-2">
@if ($database->started_at)
<x-forms.input label="Username" id="database.postgres_username" placeholder="If empty: postgres"
readonly/>
<x-forms.input label="Password" id="database.postgres_password" type="password" required readonly/>
readonly helper="You can only modify it before the initial start."/>
<x-forms.input label="Password" id="database.postgres_password" type="password" required readonly
helper="You can only modify it before the initial start."/>
<x-forms.input label="Database" id="database.postgres_db"
placeholder="If empty, it will be the same as Username."
readonly/>
readonly
helper="You can only modify it before the initial start."/>
@else
<x-forms.input label="Username" id="database.postgres_username" placeholder="If empty: postgres"/>
<x-forms.input label="Password" id="database.postgres_password" type="password" required/>
<x-forms.input label="Username" id="database.postgres_username" placeholder="If empty: postgres"
helper="You can only modify it before the initial start."/>
<x-forms.input label="Password" id="database.postgres_password" type="password" required
helper="You can only modify it before the initial start."/>
<x-forms.input label="Database" id="database.postgres_db"
placeholder="If empty, it will be the same as Username."/>
placeholder="If empty, it will be the same as Username."
helper="You can only modify it before the initial start."/>
@endif
</div>
<div class="flex gap-2">
<x-forms.input label="Initial Arguments" id="database.postgres_initdb_args"
placeholder="If empty, use default. See in docker docs."/>
<x-forms.input label="Host Auth Method" id="database.postgres_host_auth_method"
placeholder="If empty, use default. See in docker docs."/>
</form>
</div>
<div class="">
<h3 class="py-2">Network</h3>
<x-forms.input placeholder="3000:5432" id="database.ports_mappings" label="Ports Mappings"
helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold text-warning'>Example</span>3000:5432,3002:5433"/>
</div>
</form>
<div class="pb-16">
<div class="flex gap-2 pt-4 pb-2">
<h3>Initialization scripts</h3>
<x-forms.button class="btn" onclick="newInitScript.showModal()">+ Add</x-forms.button>
</div>
<div class="flex flex-col gap-2">
@forelse(data_get($database,'init_scripts') as $script)
<livewire:project.database.init-script :script="$script" :wire:key="$script['index']"/>
@empty
<div>No initialization scripts found.</div>
@endforelse
</div>
</div>
</div>