Merge branch 'next' into refactor/remove-duplications-from-resource-overview

app/Http/Controllers/Webhook/Gitlab.php

@@ -202,7 +202,7 @@ public function manual(Request $request)
                             ]);
                             ray('Preview deployments disabled for ' . $application->name);
                         }
-                    } else if ($action === 'closed' || $action === 'close') {
+                    } else if ($action === 'closed' || $action === 'close' || $action === 'merge') {
                         $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                         if ($found) {
                             $found->delete();

app/Jobs/ApplicationDeploymentJob.php

@@ -763,7 +763,7 @@ private function save_environment_variables()
                 if ($env->version === '4.0.0-beta.239') {
                     $real_value = $env->real_value;
                 } else {
-                    if ($env->is_literal) {
+                    if ($env->is_literal || $env->is_multiline) {
                         $real_value = '\'' . $real_value . '\'';
                     } else {
                         $real_value = escapeEnvVariables($env->real_value);
@@ -804,10 +804,11 @@ private function save_environment_variables()
                 if ($env->version === '4.0.0-beta.239') {
                     $real_value = $env->real_value;
                 } else {
-                    if ($env->is_literal) {
+                    if ($env->is_literal || $env->is_multiline) {
                         $real_value = '\'' . $real_value . '\'';
                     } else {
                         $real_value = escapeEnvVariables($env->real_value);
+                        ray($real_value);
                     }
                 }
                 $envs->push($env->key . '=' . $real_value);
@@ -1948,11 +1949,17 @@ private function generate_build_env_variables()
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
                 $value = escapeshellarg($env->real_value);
+                if (str($value)->contains("\n") && data_get($env, 'is_multiline') === true) {
+                    $value = str_replace("\n", "\\\n", $value);
+                }
                 $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
                 $value = escapeshellarg($env->real_value);
+                if (str($value)->contains("\n") && data_get($env, 'is_multiline') === true) {
+                    $value = str_replace("\n", "\\\n", $value);
+                }
                 $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         }
@@ -1968,10 +1975,20 @@ private function add_build_env_variables_to_dockerfile()
         $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}");
+                if (str($env->real_value)->contains("\n") && data_get($env, 'is_multiline') === true) {
+                    $value = str_replace("\n", "\\\n", $env->real_value);
+                } else {
+                    $value = $env->real_value;
+                }
+                $dockerfile->splice(1, 0, "ARG {$env->key}={$value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
+                if (str($env->real_value)->contains("\n") && data_get($env, 'is_multiline') === true) {
+                    $value = str_replace("\n", "\\\n", $env->real_value);
+                } else {
+                    $value = $env->real_value;
+                }
                 $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}");
             }
         }

app/Jobs/CheckLogDrainContainerJob.php

@@ -40,7 +40,7 @@ public function healthcheck()
             return false;
         }
     }
-    public function handle(): void
+    public function handle()
     {
         // ray("checking log drain statuses for {$this->server->id}");
         try {

app/Livewire/Project/Database/Clickhouse/General.php

@@ -4,12 +4,14 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandaloneClickhouse;
 use Exception;
 use Livewire\Component;
 
 class General extends Component
 {
+    public Server $server;
     public StandaloneClickhouse $database;
     public ?string $db_url = null;
     public ?string $db_url_public = null;
@@ -43,10 +45,11 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
     }
     public function instantSaveAdvanced() {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Livewire/Project/Database/Dragonfly/General.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandaloneDragonfly;
 use Exception;
 use Livewire\Component;
@@ -12,6 +13,7 @@ class General extends Component
 {
     protected $listeners = ['refresh'];
 
+    public Server $server;
     public StandaloneDragonfly $database;
     public ?string $db_url = null;
     public ?string $db_url_public = null;
@@ -41,10 +43,11 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
     }
     public function instantSaveAdvanced() {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Livewire/Project/Database/Keydb/General.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandaloneKeydb;
 use Exception;
 use Livewire\Component;
@@ -12,6 +13,7 @@ class General extends Component
 {
     protected $listeners = ['refresh'];
 
+    public Server $server;
     public StandaloneKeydb $database;
     public ?string $db_url = null;
     public ?string $db_url_public = null;
@@ -43,10 +45,12 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
+
     }
     public function instantSaveAdvanced() {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Livewire/Project/Database/Mariadb/General.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandaloneMariadb;
 use Exception;
 use Livewire\Component;
@@ -12,6 +13,7 @@ class General extends Component
 {
     protected $listeners = ['refresh'];
 
+    public Server $server;
     public StandaloneMariadb $database;
     public ?string $db_url = null;
     public ?string $db_url_public = null;
@@ -50,10 +52,12 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
+
     }
     public function instantSaveAdvanced() {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Livewire/Project/Database/Mongodb/General.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandaloneMongodb;
 use Exception;
 use Livewire\Component;
@@ -12,6 +13,7 @@ class General extends Component
 {
     protected $listeners = ['refresh'];
 
+    public Server $server;
     public StandaloneMongodb $database;
     public ?string $db_url = null;
     public ?string $db_url_public = null;
@@ -48,11 +50,13 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
+
     }
     public function instantSaveAdvanced()
     {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Livewire/Project/Database/Mysql/General.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandaloneMysql;
 use Exception;
 use Livewire\Component;
@@ -13,6 +14,7 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneMysql $database;
+    public Server $server;
     public ?string $db_url = null;
     public ?string $db_url_public = null;
 
@@ -50,11 +52,12 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
     }
     public function instantSaveAdvanced()
     {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Livewire/Project/Database/Postgresql/General.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use Exception;
 use Livewire\Component;
@@ -13,6 +14,7 @@
 class General extends Component
 {
     public StandalonePostgresql $database;
+    public Server $server;
     public string $new_filename;
     public string $new_content;
     public ?string $db_url = null;
@@ -57,11 +59,12 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
     }
     public function instantSaveAdvanced()
     {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Livewire/Project/Database/Redis/General.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\Server;
 use App\Models\StandaloneRedis;
 use Exception;
 use Livewire\Component;
@@ -12,6 +13,7 @@ class General extends Component
 {
     protected $listeners = ['refresh'];
 
+    public Server $server;
     public StandaloneRedis $database;
     public ?string $db_url = null;
     public ?string $db_url_public = null;
@@ -43,10 +45,12 @@ public function mount()
         if ($this->database->is_public) {
             $this->db_url_public = $this->database->get_db_url();
         }
+        $this->server = data_get($this->database,'destination.server');
+
     }
     public function instantSaveAdvanced() {
         try {
-            if (!$this->database->destination->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
                 return;

app/Notifications/Channels/TelegramChannel.php

@@ -22,6 +22,8 @@ public function send($notifiable, $notification): void
                 $topicId = data_get($notifiable, 'telegram_notifications_test_message_thread_id');
                 break;
             case 'App\Notifications\Application\StatusChanged':
+            case 'App\Notifications\Container\ContainerRestarted':
+            case 'App\Notifications\Container\ContainerStopped':
                 $topicId = data_get($notifiable, 'telegram_notifications_status_changes_message_thread_id');
                 break;
             case 'App\Notifications\Application\DeploymentSuccess':

config/sentry.php

@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.295',
+    'release' => '4.0.0-beta.297',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.295';
+return '4.0.0-beta.297';

resources/views/livewire/project/database/clickhouse/general.blade.php

@@ -15,8 +15,8 @@
 
         @if ($database->started_at)
             <div class="flex gap-2">
-                <x-forms.input label="Initial Username" id="database.clickhouse_admin_user" placeholder="If empty: clickhouse"
+                <x-forms.input label="Initial Username" id="database.clickhouse_admin_user"
-                    readonly helper="You can only change this in the database." />
+                    placeholder="If empty: clickhouse" readonly helper="You can only change this in the database." />
                 <x-forms.input label="Initial Password" id="database.clickhouse_admin_password" type="password" required
                     readonly helper="You can only change this in the database." />
             </div>
@@ -34,9 +34,6 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
             <x-forms.input label="Clickhouse URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
@@ -47,6 +44,23 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
     </form>
     <h3 class="pt-4">Advanced</h3>
     <div class="flex flex-col">

resources/views/livewire/project/database/dragonfly/general.blade.php

@@ -16,9 +16,6 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
             <x-forms.input label="Dragonfly URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
@@ -29,6 +26,23 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
         {{-- <x-forms.textarea
             helper="<a target='_blank' class='underline dark:text-white' href='https://raw.githubusercontent.com/Snapchat/KeyDB/unstable/keydb.conf'>KeyDB Default Configuration</a>"
             label="Custom Dragonfly Configuration" rows="10" id="database.keydb_conf" /> --}}

resources/views/livewire/project/database/keydb/general.blade.php

@@ -17,9 +17,6 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
             <x-forms.input label="KeyDB URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
@@ -30,6 +27,23 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
         <x-forms.textarea
             helper="<a target='_blank' class='underline dark:text-white' href='https://raw.githubusercontent.com/Snapchat/KeyDB/unstable/keydb.conf'>KeyDB Default Configuration</a>"
             label="Custom KeyDB Configuration" rows="10" id="database.keydb_conf" />

resources/views/livewire/project/database/mariadb/general.blade.php

@@ -45,9 +45,6 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
             <x-forms.input label="MariaDB URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
@@ -58,6 +55,23 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
         <x-forms.textarea label="Custom MariaDB Configuration" rows="10" id="database.mariadb_conf" />
         <h3 class="pt-4">Advanced</h3>
         <div class="flex flex-col">

resources/views/livewire/project/database/mongodb/general.blade.php

@@ -18,9 +18,11 @@
         @if ($database->started_at)
             <div class="flex flex-col gap-2">
                 <x-forms.input label="Initial Username" id="database.mongo_initdb_root_username"
-                    placeholder="If empty: postgres"  helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
+                    placeholder="If empty: postgres"
+                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
                 <x-forms.input label="Initial Password" id="database.mongo_initdb_root_password" type="password"
-                    required  helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
+                    required
+                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
                 <x-forms.input label="Initial Database" id="database.mongo_initdb_database"
                     placeholder="If empty, it will be the same as Username." readonly
                     helper="You can only change this in the database." />
@@ -39,9 +41,6 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
             <x-forms.input label="Mongo URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
@@ -52,6 +51,23 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
         <x-forms.textarea label="Custom MongoDB Configuration" rows="10" id="database.mongo_conf" />
         <h3 class="pt-4">Advanced</h3>
         <div class="flex flex-col">

resources/views/livewire/project/database/mysql/general.blade.php

@@ -45,9 +45,6 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
             <x-forms.input label="MySQL URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
@@ -58,6 +55,23 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
         <x-forms.textarea label="Custom Mysql Configuration" rows="10" id="database.mysql_conf" />
         <h3 class="pt-4">Advanced</h3>
         <div class="flex flex-col">

resources/views/livewire/project/database/postgresql/general.blade.php

@@ -26,7 +26,8 @@
             <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>" />
         </div>
-        <div class="pt-2 dark:text-warning">If you change the values in the database, please sync it here, otherwise automations (like backups) won't work.
+        <div class="pt-2 dark:text-warning">If you change the values in the database, please sync it here, otherwise
+            automations (like backups) won't work.
         </div>
         @if ($database->started_at)
             <div class="flex flex-col gap-2">
@@ -57,10 +58,8 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
+
             <x-forms.input label="Postgres URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
                 type="password" readonly wire:model="db_url" />
@@ -70,6 +69,23 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
         <x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" id="database.postgres_conf" />
     </form>
     <h3 class="pt-4">Advanced</h3>

resources/views/livewire/project/database/redis/general.blade.php

@@ -17,9 +17,6 @@
             <div class="flex items-end gap-2">
                 <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 dark:text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
-                    label="Public Port" />
-                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
             </div>
             <x-forms.input label="Redis URL (internal)"
                 helper="If you change the user/password/port, this could be different. This is with the default values."
@@ -30,8 +27,25 @@
                     type="password" readonly wire:model="db_url_public" />
             @endif
         </div>
+        <div>
+            <h3 class="py-2">Proxy</h3>
+            <div class="flex items-end gap-2">
+                <x-forms.input placeholder="5432" disabled="{{ data_get($database, 'is_public') }}"
+                    id="database.public_port" label="Public Port" />
+                <x-slide-over fullScreen>
+                    <x-slot:title>Proxy Logs</x-slot:title>
+                    <x-slot:content>
+                        <livewire:project.shared.get-logs :server="$server" :resource="$database"
+                            container="{{ data_get($database, 'uuid') }}-proxy" lazy />
+                    </x-slot:content>
+                    <x-forms.button disabled="{{ !data_get($database, 'is_public') }}" @click="slideOverOpen=true"
+                        class="w-28">Proxy Logs</x-forms.button>
+                </x-slide-over>
+                <x-forms.checkbox instantSave id="database.is_public" label="Make it publicly available" />
+            </div>
+        </div>
         <x-forms.textarea
-            helper="<a target='_blank' class='dark:text-white underline' href='https://raw.githubusercontent.com/redis/redis/7.2/redis.conf'>Redis Default Configuration</a>"
+            helper="<a target='_blank' class='underline dark:text-white' href='https://raw.githubusercontent.com/redis/redis/7.2/redis.conf'>Redis Default Configuration</a>"
             label="Custom Redis Configuration" rows="10" id="database.redis_conf" />
         <h3 class="pt-4">Advanced</h3>
         <div class="flex flex-col">

resources/views/livewire/project/shared/environment-variable/show.blade.php

@@ -63,9 +63,11 @@ class="font-bold dark:text-warning text-coollabs">{{ $env->key }}</span>.
                         @else
                             <x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
                             <x-forms.checkbox instantSave id="env.is_multiline" label="Is Multiline?" />
-                            <x-forms.checkbox instantSave id="env.is_literal"
+                            @if (!data_get($env, 'is_multiline'))
-                                helper="This means that when you use $VARIABLES in a value, it should be interpreted as the actual characters '$VARIABLES' and not as the value of a variable named VARIABLE.<br><br>Useful if you have $ sign in your value and there are some characters after it, but you would not like to interpolate it form another value. In this case, you should set this to true."
+                                <x-forms.checkbox instantSave id="env.is_literal"
-                                label="Is Literal?" />
+                                    helper="This means that when you use $VARIABLES in a value, it should be interpreted as the actual characters '$VARIABLES' and not as the value of a variable named VARIABLE.<br><br>Useful if you have $ sign in your value and there are some characters after it, but you would not like to interpolate it form another value. In this case, you should set this to true."
+                                    label="Is Literal?" />
+                            @endif
                         @endif
                     @endif
                 @endif

resources/views/livewire/project/shared/get-logs.blade.php

@@ -34,7 +34,7 @@
         }
     }">
         <div class="flex items-center gap-2 ">
-            @if ($resource?->type() === 'application')
+            @if ($resource?->type() === 'application' || str($resource?->type())->startsWith('standalone'))
                 <h4>{{ $container }}</h4>
             @else
                 <h3>{{ str($container)->beforeLast('-')->headline() }}</h3>

scripts/install.sh

@@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status
 #set -u # Treat unset variables as an error and exit
 set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
 
-VERSION="1.3.1"
+VERSION="1.3.2"
 DOCKER_VERSION="26.0"
 
 CDN="https://cdn.coollabs.io/coolify"
@@ -22,6 +22,11 @@ if [ "$OS_TYPE" = "pop" ]; then
     OS_TYPE="ubuntu"
 fi
 
+# Check if the OS is linuxmint, if so, change it to ubuntu
+if [ "$OS_TYPE" = "linuxmint" ]; then
+    OS_TYPE="ubuntu"
+fi
+
 if [ "$OS_TYPE" = "arch" ]; then
     OS_VERSION="rolling"
 else

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.295"
+            "version": "4.0.0-beta.297"
         },
         "sentinel": {
             "version": "0.0.4"