feat: add more persistent storage types

app/Actions/Database/StartClickhouse.php

@@ -29,6 +29,7 @@ public function handle(StandaloneClickhouse $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
 
@@ -93,6 +94,11 @@ public function handle(StandaloneClickhouse $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Actions/Database/StartDragonfly.php

@@ -32,6 +32,7 @@ public function handle(StandaloneDragonfly $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
 
@@ -94,6 +95,11 @@ public function handle(StandaloneDragonfly $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Actions/Database/StartKeydb.php

@@ -32,6 +32,7 @@ public function handle(StandaloneKeydb $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->add_custom_keydb();
@@ -92,6 +93,11 @@ public function handle(StandaloneKeydb $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Actions/Database/StartMariadb.php

@@ -28,6 +28,7 @@ public function handle(StandaloneMariadb $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->add_custom_mysql();
@@ -86,6 +87,11 @@ public function handle(StandaloneMariadb $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Actions/Database/StartMongodb.php

@@ -30,6 +30,7 @@ public function handle(StandaloneMongodb $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->add_custom_mongo_conf();
@@ -94,6 +95,11 @@ public function handle(StandaloneMongodb $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Actions/Database/StartMysql.php

@@ -28,6 +28,7 @@ public function handle(StandaloneMysql $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->add_custom_mysql();
@@ -86,6 +87,11 @@ public function handle(StandaloneMysql $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Actions/Database/StartPostgresql.php

@@ -29,6 +29,7 @@ public function handle(StandalonePostgresql $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->generate_init_scripts();
@@ -92,6 +93,11 @@ public function handle(StandalonePostgresql $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Actions/Database/StartRedis.php

@@ -32,6 +32,7 @@ public function handle(StandaloneRedis $database)
         ];
 
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->add_custom_redis();
@@ -96,6 +97,11 @@ public function handle(StandaloneRedis $database)
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Jobs/ApplicationDeploymentJob.php

@@ -1359,6 +1359,7 @@ private function generate_compose_file()
             $onlyPort = $ports[0];
         }
         $persistent_storages = $this->generate_local_persistent_volumes();
+        $persistent_file_volumes = $this->application->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         // $environment_variables = $this->generate_environment_variables($ports);
         $this->save_environment_variables();
@@ -1559,6 +1560,11 @@ private function generate_compose_file()
         if (count($persistent_storages) > 0) {
             $docker_compose['services'][$this->container_name]['volumes'] = $persistent_storages;
         }
+        if (count($persistent_file_volumes) > 0) {
+            $docker_compose['services'][$this->container_name]['volumes'] = $persistent_file_volumes->map(function ($item) {
+                return "$item->fs_path:$item->mount_path";
+            })->toArray();
+        }
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }

app/Livewire/Project/Service/FileStorage.php

@@ -7,13 +7,20 @@
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
 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 Livewire\Component;
 use Illuminate\Support\Str;
 
 class FileStorage extends Component
 {
     public LocalFileVolume $fileStorage;
-    public ServiceApplication|ServiceDatabase|StandaloneClickhouse|Application $resource;
+    public ServiceApplication|StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse|ServiceDatabase|Application $resource;
     public string $fs_path;
     public ?string $workdir = null;
 
@@ -27,7 +34,7 @@ public function mount()
     {
         $this->resource = $this->fileStorage->service;
         if (Str::of($this->fileStorage->fs_path)->startsWith('.')) {
-            $this->workdir = $this->resource->service->workdir();
+            $this->workdir = $this->resource->service?->workdir();
             $this->fs_path = Str::of($this->fileStorage->fs_path)->after('.');
         } else {
             $this->workdir = null;

app/Livewire/Project/Shared/Storages/Add.php

@@ -3,21 +3,31 @@
 namespace App\Livewire\Project\Shared\Storages;
 
 use App\Models\Application;
+use App\Models\LocalFileVolume;
 use Livewire\Component;
 
 class Add extends Component
 {
+    public $resource;
     public $uuid;
     public $parameters;
     public $isSwarm = false;
     public string $name;
     public string $mount_path;
     public ?string $host_path = null;
+    public string $file_storage_path;
+    public string $file_storage_content;
+    public string $file_storage_directory_source;
+    public string $file_storage_directory_destination;
 
     public $rules = [
         'name' => 'required|string',
         'mount_path' => 'required|string',
         'host_path' => 'string|nullable',
+        'file_storage_path' => 'string',
+        'file_storage_content' => 'string',
+        'file_storage_directory_source' => 'string',
+        'file_storage_directory_destination' => 'string',
     ];
 
     protected $listeners = ['clearAddStorage' => 'clear'];
@@ -26,10 +36,16 @@ class Add extends Component
         'name' => 'name',
         'mount_path' => 'mount',
         'host_path' => 'host',
+        'file_storage_path' => 'file storage path',
+        'file_storage_content' => 'file storage content',
+        'file_storage_directory_source' => 'file storage directory source',
+        'file_storage_directory_destination' => 'file storage directory destination',
     ];
 
     public function mount()
     {
+        $this->file_storage_directory_source = application_configuration_dir() . "/{$this->resource->uuid}";
+        $this->uuid = $this->resource->uuid;
         $this->parameters = get_route_parameters();
         if (data_get($this->parameters, 'application_uuid')) {
             $applicationUuid = $this->parameters['application_uuid'];
@@ -43,8 +59,53 @@ public function mount()
             }
         }
     }
+    public function submitFileStorage()
+    {
+        try {
+            $this->file_storage_path = trim($this->file_storage_path);
+            $this->file_storage_path = str($this->file_storage_path)->start('/')->value();
+            if ($this->resource->getMorphClass() === 'App\Models\Application') {
+                $fs_path = application_configuration_dir() . '/' . $this->resource->uuid . $this->file_storage_path;
+            }
+            LocalFileVolume::create(
+                [
+                    'fs_path' => $fs_path,
+                    'mount_path' => $this->file_storage_path,
+                    'content' => $this->file_storage_content,
+                    'is_directory' => false,
+                    'resource_id' => $this->resource->id,
+                    'resource_type' => get_class($this->resource)
+                ],
+            );
+            $this->dispatch('refresh_storages');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
 
-    public function submit()
+    }
+    public function submitFileStorageDirectory()
+    {
+        try {
+            $this->file_storage_directory_source = trim($this->file_storage_directory_source);
+            $this->file_storage_directory_source = str($this->file_storage_directory_source)->start('/')->value();
+            $this->file_storage_directory_destination = trim($this->file_storage_directory_destination);
+            $this->file_storage_directory_destination = str($this->file_storage_directory_destination)->start('/')->value();
+            LocalFileVolume::create(
+                [
+                    'fs_path' => $this->file_storage_directory_source,
+                    'mount_path' => $this->file_storage_directory_destination,
+                    'is_directory' => true,
+                    'resource_id' => $this->resource->id,
+                    'resource_type' => get_class($this->resource)
+                ],
+            );
+            $this->dispatch('refresh_storages');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+
+    }
+    public function submitPersistentVolume()
     {
         try {
             $this->validate($this->rules);
@@ -54,7 +115,7 @@ public function submit()
                 'mount_path' => $this->mount_path,
                 'host_path' => $this->host_path,
             ]);
-            $this->dispatch('closeStorageModal');
+
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

resources/views/livewire/project/service/file-storage.blade.php

@@ -1,12 +1,14 @@
 <div class="p-4 transition border rounded dark:border-coolgray-200">
     <div class="flex flex-col justify-center pb-4 text-sm select-text">
+        @if (data_get($resource, 'build_pack') === 'dockercompose')
             <h2>{{ data_get($resource, 'name', 'unknown') }}</h2>
-        <div>{{ $workdir }}{{ $fs_path }} -> {{ $fileStorage->mount_path }}</div>
-        @if ($fileStorage->is_directory)
-            <div class="text-xs">Directory</div>
-        @else
-            <div class="text-xs">File</div>
         @endif
+        @if ($fileStorage->is_directory)
+            <div class="dark:text-white">Directory Mount</div>
+        @else
+            <div class="dark:text-white">File Mount</div>
+        @endif
+        <div>{{ $workdir }}{{ $fs_path }} -> {{ $fileStorage->mount_path }}</div>
     </div>
     <form wire:submit='submit' class="flex flex-col gap-2">
         <div class="flex gap-2">
@@ -16,7 +18,8 @@
                 </x-modal-confirmation>
             @else
                 <x-modal-confirmation action="convertToDirectory" buttonTitle="Convert to directory">
-                    This will convert this to a directory. If it was a file, it will be deleted. It is not reversible. <br>Please think again.
+                    This will convert this to a directory. If it was a file, it will be deleted. It is not reversible.
+                    <br>Please think again.
                 </x-modal-confirmation>
             @endif
             <x-modal-confirmation isErrorButton buttonTitle="Delete">

resources/views/livewire/project/service/storage.blade.php

@@ -15,8 +15,8 @@
                     volume
                     name, example: <span class='text-helper'>-pr-1</span>" />
             @if ($resource?->build_pack !== 'dockercompose')
-                <x-modal-input buttonTitle="+ Add" title="New Persistent Storage">
+                <x-modal-input :closeOutside="false" buttonTitle="+ Add" title="New Persistent Storage">
-                    <livewire:project.shared.storages.add :uuid="$resource->uuid" />
+                    <livewire:project.shared.storages.add :resource="$resource"/>
                 </x-modal-input>
             @endif
         </div>

resources/views/livewire/project/shared/storages/add.blade.php

@@ -1,4 +1,7 @@
-<form class="flex flex-col w-full gap-2 rounded" wire:submit='submit'>
+<div class="flex flex-col w-full gap-2 rounded">
+    You can add Volumes, Files and Directories to your resources here.
+    <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitPersistentVolume'>
+        <h3>Volume Mount</h3>
         @if ($isSwarm)
             <h5>Swarm Mode detected: You need to set a shared volume (EFS/NFS/etc) on all the worker nodes if you would
                 like to use a persistent volumes.</h5>
@@ -8,11 +11,33 @@
             <x-forms.input placeholder="/root" id="host_path" label="Source Path" required
                 helper="Directory on the host system." />
         @else
-        <x-forms.input placeholder="/root" id="host_path" label="Source Path" helper="Directory on the host system." />
+            <x-forms.input placeholder="/root" id="host_path" label="Source Path"
+                helper="Directory on the host system." />
         @endif
         <x-forms.input placeholder="/tmp/root" id="mount_path" label="Destination Path" required
             helper="Directory inside the container." />
-    <x-forms.button type="submit" @click="slideOverOpen=false">
+        <x-forms.button type="submit" @click="modalOpen=false">
             Save
         </x-forms.button>
     </form>
+    <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitFileStorage'>
+        <h3>File Mount</h3>
+        <x-forms.input placeholder="/etc/nginx/nginx.conf" id="file_storage_path" label="Destination Path" required
+            helper="File inside the container" />
+        <x-forms.textarea label="Content" id="file_storage_content"></x-forms.textarea>
+        <x-forms.button type="submit" @click="modalOpen=false">
+            Save
+        </x-forms.button>
+    </form>
+    <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitFileStorageDirectory'>
+        <h3>Directory Mount</h3>
+        <x-forms.input placeholder="{{ application_configuration_dir() }}/{{ $resource->uuid }}/etc/nginx"
+            id="file_storage_directory_source" label="Source Directory" required
+            helper="Directory on the host system." />
+        <x-forms.input placeholder="/etc/nginx" id="file_storage_directory_destination" label="Destination Directory"
+            required helper="Directory inside the container." />
+        <x-forms.button type="submit" @click="modalOpen=false">
+            Save
+        </x-forms.button>
+    </form>
+</div>

resources/views/livewire/project/shared/storages/show.blade.php

@@ -4,27 +4,27 @@
             @if ($isFirst)
                 <x-forms.input id="storage.name" label="Volume Name" required
                     helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
-                <x-forms.input id="storage.host_path" label="Source Path (on host)"
+                <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path"
                     helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
-                <x-forms.input id="storage.mount_path" label="Destination Path (in container)" required readonly />
+                <x-forms.input id="storage.mount_path" label="Destination Path" helper="Directory inside the container." required readonly />
                 <x-forms.button type="submit">
                     Update
                 </x-forms.button>
             @else
                 <x-forms.input id="storage.name" required readonly
                     helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
-                <x-forms.input id="storage.host_path" readonly />
+                <x-forms.input id="storage.host_path" helper="Directory on the host system."  readonly />
-                <x-forms.input id="storage.mount_path" required readonly />
+                <x-forms.input id="storage.mount_path"  helper="Directory inside the container." required readonly />
             @endif
         @else
             @if ($isFirst)
                 <x-forms.input id="storage.name" label="Volume Name" required />
-                <x-forms.input id="storage.host_path" label="Source Path (on host)" />
+                <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path" />
-                <x-forms.input id="storage.mount_path" label="Destination Path (in container)" required />
+                <x-forms.input id="storage.mount_path" label="Destination Path" helper="Directory inside the container." required />
             @else
                 <x-forms.input id="storage.name" required />
-                <x-forms.input id="storage.host_path" />
+                <x-forms.input id="storage.host_path" helper="Directory on the host system." />
-                <x-forms.input id="storage.mount_path" required />
+                <x-forms.input id="storage.mount_path" helper="Directory inside the container." required />
             @endif
             <div class="flex gap-2">
                 <x-forms.button type="submit">