From c4dfd99a8c1de24f31e49aec509f9ad1a5e558dc Mon Sep 17 00:00:00 2001
From: iamEvan <chanevan0819@gmail.com>
Date: Sun, 14 Apr 2024 21:31:55 +0100
Subject: [PATCH 01/21] init commit

---
 app/Livewire/Project/Database/Import.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index 74e41056a..11c6da314 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -27,6 +27,7 @@ class Import extends Component
     public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
     public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE';
     public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE';
+    public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip';
 
     public function getListeners()
     {
@@ -62,8 +63,7 @@ class Import extends Component
             $this->resource->getMorphClass() == 'App\Models\StandaloneRedis' ||
             $this->resource->getMorphClass() == 'App\Models\StandaloneKeydb' ||
             $this->resource->getMorphClass() == 'App\Models\StandaloneDragonfly' ||
-            $this->resource->getMorphClass() == 'App\Models\StandaloneClickhouse' ||
-            $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb'
+            $this->resource->getMorphClass() == 'App\Models\StandaloneClickhouse'
         ) {
             $this->unsupported = true;
         }
@@ -101,6 +101,10 @@ class Import extends Component
                     $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->postgresqlRestoreCommand} {$tmpPath}'";
                     $this->importCommands[] = "rm {$tmpPath}";
                     break;
+                case 'App\Models\StandaloneMongodb':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mongodbRestoreCommand} {$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
             }
 
             $this->importCommands[] = "docker exec {$this->container} sh -c 'rm {$tmpPath}'";

From 23de13b82c8aca6d2d6264e6f10337786f4b6bee Mon Sep 17 00:00:00 2001
From: iamEvan <chanevan0819@gmail.com>
Date: Thu, 25 Apr 2024 22:44:46 +0100
Subject: [PATCH 02/21] mac dev docker-compose

---
 docker-compose-mac.dev.yml | 118 +++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 docker-compose-mac.dev.yml

diff --git a/docker-compose-mac.dev.yml b/docker-compose-mac.dev.yml
new file mode 100644
index 000000000..ec1e9814f
--- /dev/null
+++ b/docker-compose-mac.dev.yml
@@ -0,0 +1,118 @@
+version: "3.8"
+
+services:
+  coolify:
+    build:
+      context: .
+      dockerfile: ./docker/dev-ssu/Dockerfile
+    ports:
+      - "${APP_PORT:-8000}:80"
+    environment:
+      PUID: "${USERID:-1000}"
+      PGID: "${GROUPID:-1000}"
+      SSL_MODE: "off"
+      AUTORUN_LARAVEL_STORAGE_LINK: "false"
+      AUTORUN_LARAVEL_MIGRATION: "false"
+      PUSHER_HOST: "${PUSHER_HOST}"
+      PUSHER_PORT: "${PUSHER_PORT}"
+      PUSHER_SCHEME: "${PUSHER_SCHEME:-http}"
+      PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
+      PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
+      PUSHER_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
+    volumes:
+      - .:/var/www/html/:cached
+  postgres:
+    pull_policy: always
+    ports:
+      - "${FORWARD_DB_PORT:-5432}:5432"
+    env_file:
+      - .env
+    environment:
+      POSTGRES_USER: "${DB_USERNAME:-coolify}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD:-password}"
+      POSTGRES_DB: "${DB_DATABASE:-coolify}"
+      POSTGRES_HOST_AUTH_METHOD: "trust"
+    volumes:
+      # - /data/coolify/_volumes/database/:/var/lib/postgresql/data
+      - coolify-pg-data-dev:/var/lib/postgresql/data
+  redis:
+    pull_policy: always
+    ports:
+      - "${FORWARD_REDIS_PORT:-6379}:6379"
+    env_file:
+      - .env
+    volumes:
+      # - /data/coolify/_volumes/redis/:/data
+      - coolify-redis-data-dev:/data
+  soketi:
+    env_file:
+      - .env
+    ports:
+      - "${FORWARD_SOKETI_PORT:-6001}:6001"
+    environment:
+      SOKETI_DEBUG: "false"
+      SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}"
+      SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
+      SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
+  vite:
+    image: node:20
+    pull_policy: always
+    working_dir: /var/www/html
+    # environment:
+    # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
+    ports:
+      - "${VITE_PORT:-5173}:${VITE_PORT:-5173}"
+    volumes:
+      - .:/var/www/html:cached
+    command: sh -c "npm install && npm run dev"
+    networks:
+      - coolify
+  testing-host:
+    image: "ghcr.io/coollabsio/coolify-testing-host:latest"
+    pull_policy: always
+    init: true
+    container_name: coolify-testing-host
+    volumes:
+      - /:/host
+      - /var/run/docker.sock:/var/run/docker.sock
+      # - /data/coolify/:/data/coolify
+      - coolify-data-dev:/data/coolify
+    networks:
+      - coolify
+  mailpit:
+    image: "axllent/mailpit:latest"
+    pull_policy: always
+    container_name: coolify-mail
+    ports:
+      - "${FORWARD_MAILPIT_PORT:-1025}:1025"
+      - "${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025"
+    networks:
+      - coolify
+  minio:
+    image: minio/minio:latest
+    pull_policy: always
+    container_name: coolify-minio
+    command: server /data --console-address ":9001"
+    ports:
+      - "${FORWARD_MINIO_PORT:-9000}:9000"
+      - "${FORWARD_MINIO_PORT_CONSOLE:-9001}:9001"
+    environment:
+      MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY:-minioadmin}"
+      MINIO_SECRET_KEY: "${MINIO_SECRET_KEY:-minioadmin}"
+    volumes:
+      # - /data/coolify/_volumes/minio/:/data
+      - coolify-minio-data-dev:/data
+    networks:
+      - coolify
+
+volumes:
+  coolify-data-dev:
+  coolify-pg-data-dev:
+  coolify-redis-data-dev:
+  coolify-minio-data-dev:
+
+
+networks:
+  coolify:
+    name: coolify
+    external: false

From 3582cb3f46057278aa62ef5018b09efe91457106 Mon Sep 17 00:00:00 2001
From: iamEvan <chanevan0819@gmail.com>
Date: Thu, 25 Apr 2024 22:44:55 +0100
Subject: [PATCH 03/21] fix mongodb imports

---
 app/Livewire/Project/Database/Import.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index 11c6da314..d435289fa 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -27,7 +27,7 @@ class Import extends Component
     public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
     public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE';
     public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE';
-    public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip';
+    public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip --archive=';
 
     public function getListeners()
     {
@@ -102,7 +102,7 @@ class Import extends Component
                     $this->importCommands[] = "rm {$tmpPath}";
                     break;
                 case 'App\Models\StandaloneMongodb':
-                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mongodbRestoreCommand} {$tmpPath}'";
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mongodbRestoreCommand}{$tmpPath}'";
                     $this->importCommands[] = "rm {$tmpPath}";
                     break;
             }

From 8551e6e74af94e4b3fb58f5d62d7a9a8af0e17a8 Mon Sep 17 00:00:00 2001
From: iamEvan <chanevan0819@gmail.com>
Date: Thu, 25 Apr 2024 22:47:47 +0100
Subject: [PATCH 04/21] opps... wrong commit

---
 docker-compose-mac.dev.yml | 118 -------------------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 docker-compose-mac.dev.yml

diff --git a/docker-compose-mac.dev.yml b/docker-compose-mac.dev.yml
deleted file mode 100644
index ec1e9814f..000000000
--- a/docker-compose-mac.dev.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-version: "3.8"
-
-services:
-  coolify:
-    build:
-      context: .
-      dockerfile: ./docker/dev-ssu/Dockerfile
-    ports:
-      - "${APP_PORT:-8000}:80"
-    environment:
-      PUID: "${USERID:-1000}"
-      PGID: "${GROUPID:-1000}"
-      SSL_MODE: "off"
-      AUTORUN_LARAVEL_STORAGE_LINK: "false"
-      AUTORUN_LARAVEL_MIGRATION: "false"
-      PUSHER_HOST: "${PUSHER_HOST}"
-      PUSHER_PORT: "${PUSHER_PORT}"
-      PUSHER_SCHEME: "${PUSHER_SCHEME:-http}"
-      PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
-      PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
-      PUSHER_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
-    volumes:
-      - .:/var/www/html/:cached
-  postgres:
-    pull_policy: always
-    ports:
-      - "${FORWARD_DB_PORT:-5432}:5432"
-    env_file:
-      - .env
-    environment:
-      POSTGRES_USER: "${DB_USERNAME:-coolify}"
-      POSTGRES_PASSWORD: "${DB_PASSWORD:-password}"
-      POSTGRES_DB: "${DB_DATABASE:-coolify}"
-      POSTGRES_HOST_AUTH_METHOD: "trust"
-    volumes:
-      # - /data/coolify/_volumes/database/:/var/lib/postgresql/data
-      - coolify-pg-data-dev:/var/lib/postgresql/data
-  redis:
-    pull_policy: always
-    ports:
-      - "${FORWARD_REDIS_PORT:-6379}:6379"
-    env_file:
-      - .env
-    volumes:
-      # - /data/coolify/_volumes/redis/:/data
-      - coolify-redis-data-dev:/data
-  soketi:
-    env_file:
-      - .env
-    ports:
-      - "${FORWARD_SOKETI_PORT:-6001}:6001"
-    environment:
-      SOKETI_DEBUG: "false"
-      SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}"
-      SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
-      SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
-  vite:
-    image: node:20
-    pull_policy: always
-    working_dir: /var/www/html
-    # environment:
-    # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
-    ports:
-      - "${VITE_PORT:-5173}:${VITE_PORT:-5173}"
-    volumes:
-      - .:/var/www/html:cached
-    command: sh -c "npm install && npm run dev"
-    networks:
-      - coolify
-  testing-host:
-    image: "ghcr.io/coollabsio/coolify-testing-host:latest"
-    pull_policy: always
-    init: true
-    container_name: coolify-testing-host
-    volumes:
-      - /:/host
-      - /var/run/docker.sock:/var/run/docker.sock
-      # - /data/coolify/:/data/coolify
-      - coolify-data-dev:/data/coolify
-    networks:
-      - coolify
-  mailpit:
-    image: "axllent/mailpit:latest"
-    pull_policy: always
-    container_name: coolify-mail
-    ports:
-      - "${FORWARD_MAILPIT_PORT:-1025}:1025"
-      - "${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025"
-    networks:
-      - coolify
-  minio:
-    image: minio/minio:latest
-    pull_policy: always
-    container_name: coolify-minio
-    command: server /data --console-address ":9001"
-    ports:
-      - "${FORWARD_MINIO_PORT:-9000}:9000"
-      - "${FORWARD_MINIO_PORT_CONSOLE:-9001}:9001"
-    environment:
-      MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY:-minioadmin}"
-      MINIO_SECRET_KEY: "${MINIO_SECRET_KEY:-minioadmin}"
-    volumes:
-      # - /data/coolify/_volumes/minio/:/data
-      - coolify-minio-data-dev:/data
-    networks:
-      - coolify
-
-volumes:
-  coolify-data-dev:
-  coolify-pg-data-dev:
-  coolify-redis-data-dev:
-  coolify-minio-data-dev:
-
-
-networks:
-  coolify:
-    name: coolify
-    external: false

From ae1222268758447661f0138f9baeba152c692448 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 09:30:18 +0200
Subject: [PATCH 05/21] Update version to 4.0.0-beta.271

---
 config/sentry.php  | 2 +-
 config/version.php | 2 +-
 versions.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index e833ffdb2..15711e651 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // 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.270',
+    'release' => '4.0.0-beta.271',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index e85b7f5a5..ebbaefd2a 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.270';
+return '4.0.0-beta.271';
diff --git a/versions.json b/versions.json
index 94e018a75..d13ed03d9 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.270"
+            "version": "4.0.0-beta.271"
         }
     }
 }

From bb6c9cf49e32be1ac7f67cf124822cc914591a42 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 09:38:45 +0200
Subject: [PATCH 06/21] fix: backups

---
 app/Jobs/DatabaseBackupJob.php                |  5 +-
 app/Jobs/SendMessageToTelegramJob.php         |  2 +-
 .../Project/Database/Backup/Execution.php     |  5 --
 .../Project/Database/BackupExecutions.php     |  8 +-
 app/Models/StandaloneClickhouse.php           |  3 -
 app/Models/StandaloneDragonfly.php            |  3 -
 app/Models/StandaloneKeydb.php                |  3 -
 app/Models/StandaloneMariadb.php              |  3 -
 app/Models/StandaloneMongodb.php              |  3 -
 app/Models/StandaloneMysql.php                |  3 -
 app/Models/StandalonePostgresql.php           |  3 -
 app/Models/StandaloneRedis.php                |  3 -
 app/Notifications/Database/BackupFailed.php   | 13 ++-
 app/Notifications/Database/BackupSuccess.php  |  8 +-
 .../database/backup-executions.blade.php      | 84 ++++++++++---------
 .../database/backup/execution.blade.php       |  4 -
 .../database/scheduled-backups.blade.php      | 14 ++--
 17 files changed, 71 insertions(+), 96 deletions(-)

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index befeffed0..a09ebeada 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -289,7 +289,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     if ($this->backup->save_s3) {
                         $this->upload_to_s3();
                     }
-                    $this->team?->notify(new BackupSuccess($this->backup, $this->database));
+                    $this->team?->notify(new BackupSuccess($this->backup, $this->database, $database));
                     $this->backup_log->update([
                         'status' => 'success',
                         'message' => $this->backup_output,
@@ -305,8 +305,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                         ]);
                     }
                     send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
-                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
-                    throw $e;
+                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output, $database));
                 }
             }
         } catch (\Throwable $e) {
diff --git a/app/Jobs/SendMessageToTelegramJob.php b/app/Jobs/SendMessageToTelegramJob.php
index 4785da669..4191b02fe 100644
--- a/app/Jobs/SendMessageToTelegramJob.php
+++ b/app/Jobs/SendMessageToTelegramJob.php
@@ -57,7 +57,7 @@ class SendMessageToTelegramJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         $payload = [
-            'parse_mode' => 'markdown',
+            // 'parse_mode' => 'markdown',
             'reply_markup' => json_encode([
                 'inline_keyboard' => [
                     [...$inlineButtons],
diff --git a/app/Livewire/Project/Database/Backup/Execution.php b/app/Livewire/Project/Database/Backup/Execution.php
index 1f790d643..000b6fb2b 100644
--- a/app/Livewire/Project/Database/Backup/Execution.php
+++ b/app/Livewire/Project/Database/Backup/Execution.php
@@ -35,11 +35,6 @@ class Execution extends Component
         $this->executions = $executions;
         $this->s3s = currentTeam()->s3s;
     }
-    public function cleanupFailed()
-    {
-        $this->backup->executions()->where('status', 'failed')->delete();
-        $this->dispatch('refreshBackupExecutions');
-    }
     public function render()
     {
         return view('livewire.project.database.backup.execution');
diff --git a/app/Livewire/Project/Database/BackupExecutions.php b/app/Livewire/Project/Database/BackupExecutions.php
index b127a685c..a34d849f2 100644
--- a/app/Livewire/Project/Database/BackupExecutions.php
+++ b/app/Livewire/Project/Database/BackupExecutions.php
@@ -2,9 +2,7 @@
 
 namespace App\Livewire\Project\Database;
 
-use Illuminate\Support\Facades\Storage;
 use Livewire\Component;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class BackupExecutions extends Component
 {
@@ -16,11 +14,15 @@ class BackupExecutions extends Component
         $userId = auth()->user()->id;
         return [
             "echo-private:team.{$userId},BackupCreated" => 'refreshBackupExecutions',
-            "refreshBackupExecutions",
             "deleteBackup"
         ];
     }
 
+    public function cleanupFailed()
+    {
+        $this->backup->executions()->where('status', 'failed')->delete();
+        $this->refreshBackupExecutions();
+    }
     public function deleteBackup($exeuctionId)
     {
         $execution = $this->backup->executions()->where('id', $exeuctionId)->first();
diff --git a/app/Models/StandaloneClickhouse.php b/app/Models/StandaloneClickhouse.php
index 3746a32f5..2197d51df 100644
--- a/app/Models/StandaloneClickhouse.php
+++ b/app/Models/StandaloneClickhouse.php
@@ -207,7 +207,4 @@ class StandaloneClickhouse extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->clickhouse_db;
-    }
 }
diff --git a/app/Models/StandaloneDragonfly.php b/app/Models/StandaloneDragonfly.php
index adc1ea6cc..7b18666b8 100644
--- a/app/Models/StandaloneDragonfly.php
+++ b/app/Models/StandaloneDragonfly.php
@@ -207,7 +207,4 @@ class StandaloneDragonfly extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return '0';
-    }
 }
diff --git a/app/Models/StandaloneKeydb.php b/app/Models/StandaloneKeydb.php
index ff91322a0..c2c1b98da 100644
--- a/app/Models/StandaloneKeydb.php
+++ b/app/Models/StandaloneKeydb.php
@@ -208,7 +208,4 @@ class StandaloneKeydb extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return '0';
-    }
 }
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index 37d39f882..5e18bbfde 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -208,7 +208,4 @@ class StandaloneMariadb extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->mariadb_database;
-    }
 }
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index 30414e26b..8e4d327a3 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -223,7 +223,4 @@ class StandaloneMongodb extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return null;
-    }
 }
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index 53e9b6f22..eede451d7 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -209,7 +209,4 @@ class StandaloneMysql extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->mysql_database;
-    }
 }
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index 6435c49de..cf449a815 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -208,7 +208,4 @@ class StandalonePostgresql extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->postgres_db;
-    }
 }
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index de18c8c07..da4701df9 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -204,7 +204,4 @@ class StandaloneRedis extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return '0';
-    }
 }
diff --git a/app/Notifications/Database/BackupFailed.php b/app/Notifications/Database/BackupFailed.php
index 67fd27589..7cad486b3 100644
--- a/app/Notifications/Database/BackupFailed.php
+++ b/app/Notifications/Database/BackupFailed.php
@@ -15,21 +15,20 @@ class BackupFailed extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 1;
+    public $backoff = 10;
+    public $tries = 2;
     public string $name;
-    public ?string $database_name = null;
     public string $frequency;
 
-    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output)
+    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output, public $database_name)
     {
         $this->name = $database->name;
-        $this->database_name = $database->database_name();
         $this->frequency = $backup->frequency;
     }
 
     public function via(object $notifiable): array
     {
-        return [DiscordChannel::class, TelegramChannel::class, MailChannel::class];
+        return setNotificationChannels($notifiable, 'database_backups');
     }
 
     public function toMail(): MailMessage
@@ -47,11 +46,11 @@ class BackupFailed extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        return "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+        return "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason:\n{$this->output}";
     }
     public function toTelegram(): array
     {
-        $message = "Coolify:  Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+        $message = "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason:\n{$this->output}";
         return [
             "message" => $message,
         ];
diff --git a/app/Notifications/Database/BackupSuccess.php b/app/Notifications/Database/BackupSuccess.php
index d69a31f46..c43a12276 100644
--- a/app/Notifications/Database/BackupSuccess.php
+++ b/app/Notifications/Database/BackupSuccess.php
@@ -12,15 +12,14 @@ class BackupSuccess extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 1;
+    public $backoff = 10;
+    public $tries = 3;
     public string $name;
-    public ?string $database_name = null;
     public string $frequency;
 
-    public function __construct(ScheduledDatabaseBackup $backup, public $database)
+    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $database_name)
     {
         $this->name = $database->name;
-        $this->database_name = $database->database_name();
         $this->frequency = $backup->frequency;
     }
 
@@ -48,6 +47,7 @@ class BackupSuccess extends Notification implements ShouldQueue
     public function toTelegram(): array
     {
         $message = "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was successful.";
+        ray($message);
         return [
             "message" => $message,
         ];
diff --git a/resources/views/livewire/project/database/backup-executions.blade.php b/resources/views/livewire/project/database/backup-executions.blade.php
index ae9428923..34e2b965d 100644
--- a/resources/views/livewire/project/database/backup-executions.blade.php
+++ b/resources/views/livewire/project/database/backup-executions.blade.php
@@ -1,43 +1,51 @@
-<div class="flex flex-col-reverse gap-2">
-    @forelse($executions as $execution)
-        <form wire:key="{{ data_get($execution, 'id') }}"
-            class="relative flex flex-col p-4 bg-white box-without-bg dark:bg-coolgray-100" @class([
-                'border-green-500' => data_get($execution, 'status') === 'success',
-                'border-red-500' => data_get($execution, 'status') === 'failed',
-            ])>
-            @if (data_get($execution, 'status') === 'running')
-                <div class="absolute top-2 right-2">
-                    <x-loading />
-                </div>
-            @endif
-            <div>Database: {{ data_get($execution, 'database_name', 'N/A') }}</div>
-            <div>Status: {{ data_get($execution, 'status') }}</div>
-            <div>Started At: {{ data_get($execution, 'created_at') }}</div>
-            @if (data_get($execution, 'message'))
-                <div>Message: {{ data_get($execution, 'message') }}</div>
-            @endif
-            <div>Size: {{ data_get($execution, 'size') }} B / {{ round((int) data_get($execution, 'size') / 1024, 2) }}
-                kB / {{ round((int) data_get($execution, 'size') / 1024 / 1024, 3) }} MB
-            </div>
-            <div>Location: {{ data_get($execution, 'filename', 'N/A') }}</div>
-            <div class="flex gap-2">
-                <div class="flex-1"></div>
-                @if (data_get($execution, 'status') === 'success')
-                    <x-forms.button class=" dark:hover:bg-coolgray-400"
-                        x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
+<div>
+    <div class="flex items-center gap-2">
+        <h3 class="py-4">Executions</h3>
+        <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
+    </div>
+    <div class="flex flex-col-reverse gap-2">
+        @forelse($executions as $execution)
+            <form wire:key="{{ data_get($execution, 'id') }}"
+                class="relative flex flex-col p-4 bg-white box-without-bg dark:bg-coolgray-100"
+                @class([
+                    'border-green-500' => data_get($execution, 'status') === 'success',
+                    'border-red-500' => data_get($execution, 'status') === 'failed',
+                ])>
+                @if (data_get($execution, 'status') === 'running')
+                    <div class="absolute top-2 right-2">
+                        <x-loading />
+                    </div>
                 @endif
-                <x-modal-confirmation isErrorButton action="deleteBackup({{ data_get($execution, 'id') }})">
-                    <x-slot:button-title>
-                        Delete
-                    </x-slot:button-title>
-                    This will delete this backup. It is not reversible.<br>Please think again.
-                </x-modal-confirmation>
-            </div>
-        </form>
+                <div>Database: {{ data_get($execution, 'database_name', 'N/A') }}</div>
+                <div>Status: {{ data_get($execution, 'status') }}</div>
+                <div>Started At: {{ data_get($execution, 'created_at') }}</div>
+                @if (data_get($execution, 'message'))
+                    <div>Message: {{ data_get($execution, 'message') }}</div>
+                @endif
+                <div>Size: {{ data_get($execution, 'size') }} B /
+                    {{ round((int) data_get($execution, 'size') / 1024, 2) }}
+                    kB / {{ round((int) data_get($execution, 'size') / 1024 / 1024, 3) }} MB
+                </div>
+                <div>Location: {{ data_get($execution, 'filename', 'N/A') }}</div>
+                <div class="flex gap-2">
+                    <div class="flex-1"></div>
+                    @if (data_get($execution, 'status') === 'success')
+                        <x-forms.button class=" dark:hover:bg-coolgray-400"
+                            x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
+                    @endif
+                    <x-modal-confirmation isErrorButton action="deleteBackup({{ data_get($execution, 'id') }})">
+                        <x-slot:button-title>
+                            Delete
+                        </x-slot:button-title>
+                        This will delete this backup. It is not reversible.<br>Please think again.
+                    </x-modal-confirmation>
+                </div>
+            </form>
 
-    @empty
-        <div>No executions found.</div>
-    @endforelse
+        @empty
+            <div>No executions found.</div>
+        @endforelse
+    </div>
     <script>
         function download_file(executionId) {
             window.open('/download/backup/' + executionId, '_blank');
diff --git a/resources/views/livewire/project/database/backup/execution.blade.php b/resources/views/livewire/project/database/backup/execution.blade.php
index 16a0ac493..9056296fe 100644
--- a/resources/views/livewire/project/database/backup/execution.blade.php
+++ b/resources/views/livewire/project/database/backup/execution.blade.php
@@ -4,10 +4,6 @@
     <livewire:project.database.heading :database="$database" />
     <div class="pt-6">
         <livewire:project.database.backup-edit :backup="$backup" :s3s="$s3s" :status="data_get($database, 'status')" />
-        <div class="flex items-center gap-2">
-            <h3 class="py-4">Executions</h3>
-            <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
-        </div>
         <livewire:project.database.backup-executions :backup="$backup" :executions="$executions" />
     </div>
 </div>
diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php
index 8bdcae767..0dce5fb9a 100644
--- a/resources/views/livewire/project/database/scheduled-backups.blade.php
+++ b/resources/views/livewire/project/database/scheduled-backups.blade.php
@@ -2,21 +2,21 @@
     <div class="flex flex-wrap gap-2">
         @forelse($database->scheduledBackups as $backup)
             @if ($type == 'database')
-                <div class="box">
-                    <a class="flex flex-col"
-                        href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
+                <a class="box"
+                    href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
+                    <div class="flex flex-col">
                         <div>Frequency: {{ $backup->frequency }}</div>
                         <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
                         <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
-                    </a>
-                </div>
+                    </div>
+                </a>
             @else
-                <div class="box">
+                <div class="box" wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
                     <div @class([
                         'border-coollabs' =>
                             data_get($backup, 'id') === data_get($selectedBackup, 'id'),
                         'flex flex-col  border-l-2 border-transparent',
-                    ]) wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
+                    ])>
                         <div>Frequency: {{ $backup->frequency }}</div>
                         <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
                         <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>

From 3df80f2653d06cbf279d4af17ea0d552a721c949 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 09:57:46 +0200
Subject: [PATCH 07/21] fix: autoupdate

---
 app/Console/Kernel.php             | 2 +-
 app/Jobs/InstanceAutoUpdateJob.php | 3 ++-
 scripts/upgrade.sh                 | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 31760f2fd..734063b2e 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -83,7 +83,7 @@ class Kernel extends ConsoleKernel
     }
     private function instance_auto_update($schedule)
     {
-        if (isDev()) {
+        if (isDev() || isCloud()) {
             return;
         }
         $settings = InstanceSettings::get();
diff --git a/app/Jobs/InstanceAutoUpdateJob.php b/app/Jobs/InstanceAutoUpdateJob.php
index fa5c29421..dc35aa2b1 100644
--- a/app/Jobs/InstanceAutoUpdateJob.php
+++ b/app/Jobs/InstanceAutoUpdateJob.php
@@ -15,7 +15,8 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 120;
+    public $timeout = 600;
+    public $tries = 1;
 
     public function __construct(private bool $force = false)
     {
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index bb1112bd5..da5f84c28 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -30,7 +30,7 @@ docker network create --attachable coolify 2>/dev/null
 
 if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
     echo "docker-compose.custom.yml detected."
-    docker run --pull always -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --pull always --remove-orphans --force-recreate"
+    docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --pull always --remove-orphans --force-recreate"
 else
-    docker run --pull always -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --pull always --remove-orphans --force-recreate"
+    docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --pull always --remove-orphans --force-recreate"
 fi

From 94ad56fc96cf1227ccb614338795771bdf935cfb Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 10:49:50 +0200
Subject: [PATCH 08/21] Add generate_unique_uuid parameter to
 fqdnLabelsForTraefik function

---
 bootstrap/helpers/docker.php                               | 7 +++++--
 bootstrap/helpers/shared.php                               | 3 ++-
 resources/views/livewire/project/shared/get-logs.blade.php | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index a70c85a72..a087c92c5 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -8,6 +8,7 @@ use App\Models\ServiceApplication;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Spatie\Url\Url;
+use Visus\Cuid2\Cuid2;
 
 function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null, ?bool $includePullrequests = false): Collection
 {
@@ -272,7 +273,7 @@ function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains,
     }
     return $labels->sort();
 }
-function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null)
+function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null, bool $generate_unique_uuid = false)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
@@ -313,7 +314,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
     }
     foreach ($domains as $loop => $domain) {
         try {
-            // $uuid = new Cuid2(7);
+            if ($generate_unique_uuid) {
+                $uuid = new Cuid2(7);
+            }
             $url = Url::fromString($domain);
             $host = $url->getHost();
             $path = $url->getPath();
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index b2c34900e..0161b8c95 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1620,7 +1620,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
                             uuid: $resource->uuid,
                             domains: $fqdns,
-                            serviceLabels: $serviceLabels
+                            serviceLabels: $serviceLabels,
+                            generate_unique_uuid: $resource->build_pack === 'dockercompose'
                         ));
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
                             network: $resource->destination->network,
diff --git a/resources/views/livewire/project/shared/get-logs.blade.php b/resources/views/livewire/project/shared/get-logs.blade.php
index ad4e74e0c..5faf9bccd 100644
--- a/resources/views/livewire/project/shared/get-logs.blade.php
+++ b/resources/views/livewire/project/shared/get-logs.blade.php
@@ -77,7 +77,7 @@
                             stroke-width="2" d="M12 5v14m4-4l-4 4m-4-4l4 4" />
                     </svg></button>
 
-                <button title="Fullscreen" x-show="!fullscreen" class="absolute top-6 right-4"
+                <button title="Fullscreen" x-show="!fullscreen" class="absolute top-5 right-1"
                     x-on:click="makeFullscreen"><svg class="icon" viewBox="0 0 24 24"
                         xmlns="http://www.w3.org/2000/svg">
                         <g fill="none">

From bbbeacee4d51c4affb93c1dfc88a3fd6c4b51044 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 11:05:53 +0200
Subject: [PATCH 09/21] Update popup-small.blade.php and
 configuration-checker.blade.php

---
 .../views/components/popup-small.blade.php      | 17 +++++++++++------
 .../shared/configuration-checker.blade.php      |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/resources/views/components/popup-small.blade.php b/resources/views/components/popup-small.blade.php
index 8370dcd07..97ed025fe 100644
--- a/resources/views/components/popup-small.blade.php
+++ b/resources/views/components/popup-small.blade.php
@@ -6,23 +6,28 @@
     x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0"
     x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0"
     x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
-    class="fixed bottom-0 right-0  h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-[999]"
-    x-cloak>
+    class="fixed bottom-0 right-0  h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-[999]" x-cloak>
     <div
-        class="flex flex-col items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 lg:p-8 lg:flex-row sm:rounded">
+        class="flex flex-col items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100/40 hover:dark:bg-coolgray-100/100 lg:p-8 lg:flex-row sm:rounded">
         <div
             class="flex flex-col items-start h-full pb-0 text-xs lg:items-center lg:flex-row lg:pr-6 lg:space-x-5 dark:text-neutral-300 ">
             @if (isset($icon))
                 {{ $icon }}
-
             @endif
 
             <div class="pt-0">
-                <h4 class="w-full mb-1 text-base font-bold leading-none -translate-y-1 lg:text-xl text-neutral-900 dark:text-white">
+                <h4
+                    class="w-full mb-1 text-base font-bold leading-none -translate-y-1 text-neutral-900 dark:text-white">
                     {{ $title }}
                 </h4>
-                <p class="">{{ $description }}</span></p>
+                <div>{{ $description }}</div>
             </div>
         </div>
+        <button @click="bannerVisible=false">
+            <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                stroke-width="1.5" stroke="currentColor" class="w-full h-full">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+            </svg>
+        </button>
     </div>
 </div>
diff --git a/resources/views/livewire/project/shared/configuration-checker.blade.php b/resources/views/livewire/project/shared/configuration-checker.blade.php
index a5c18039c..38b077e05 100644
--- a/resources/views/livewire/project/shared/configuration-checker.blade.php
+++ b/resources/views/livewire/project/shared/configuration-checker.blade.php
@@ -5,7 +5,7 @@
                 The latest configuration has not been applied
             </x-slot:title>
             <x-slot:icon>
-                <svg class="hidden w-16 h-16 dark:text-warning lg:block" viewBox="0 0 256 256"
+                <svg class="hidden w-10 h-10 dark:text-warning lg:block" viewBox="0 0 256 256"
                     xmlns="http://www.w3.org/2000/svg">
                     <path fill="currentColor"
                         d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />

From 360f5db2cff7814fc367dbd9e88c59b4e292681e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 11:06:06 +0200
Subject: [PATCH 10/21] add private key description

---
 resources/views/security/private-key/index.blade.php | 11 ++++++++---
 routes/web.php                                       |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/views/security/private-key/index.blade.php b/resources/views/security/private-key/index.blade.php
index 564fb1bff..65850ac48 100644
--- a/resources/views/security/private-key/index.blade.php
+++ b/resources/views/security/private-key/index.blade.php
@@ -8,10 +8,15 @@
     </div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($privateKeys as $key)
-            <a class="text-center hover:no-underline box group"
+            <a class="box"
                 href="{{ route('security.private-key.show', ['private_key_uuid' => data_get($key, 'uuid')]) }}">
-                <div class="group-hover:dark:text-white">
-                    <div>{{ $key->name }}</div>
+                <div class="flex flex-col mx-6">
+                    <div class="box-title">
+                        {{ data_get($key, 'name') }}
+                    </div>
+                    <div class="box-description">
+                        {{ $key->description }}
+                    </div>
                 </div>
             </a>
         @empty
diff --git a/routes/web.php b/routes/web.php
index bd85ecdd1..dfc768811 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -218,7 +218,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
     // Route::get('/security', fn () => view('security.index'))->name('security.index');
     Route::get('/security/private-key', fn () => view('security.private-key.index', [
-        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related'])->get()
+        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related','description'])->get()
     ]))->name('security.private-key.index');
     // Route::get('/security/private-key/new', SecurityPrivateKeyCreate::class)->name('security.private-key.create');
     Route::get('/security/private-key/{private_key_uuid}', SecurityPrivateKeyShow::class)->name('security.private-key.show');

From 6bb05a678033d8732f38fc12aec6a8a06c4a328c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 11:31:50 +0200
Subject: [PATCH 11/21] refactor backup download

---
 routes/web.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index dfc768811..8d0651f8f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -218,7 +218,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
     // Route::get('/security', fn () => view('security.index'))->name('security.index');
     Route::get('/security/private-key', fn () => view('security.private-key.index', [
-        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related','description'])->get()
+        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related', 'description'])->get()
     ]))->name('security.private-key.index');
     // Route::get('/security/private-key/new', SecurityPrivateKeyCreate::class)->name('security.private-key.create');
     Route::get('/security/private-key/{private_key_uuid}', SecurityPrivateKeyShow::class)->name('security.private-key.show');
@@ -247,10 +247,16 @@ Route::middleware(['auth'])->group(function () {
     Route::get('/download/backup/{executionId}', function () {
         try {
             $team = auth()->user()->currentTeam();
+            if (is_null($team)) {
+                return response()->json(['message' => 'Team not found.'], 404);
+            }
             $exeuctionId = request()->route('executionId');
             $execution = ScheduledDatabaseBackupExecution::where('id', $exeuctionId)->firstOrFail();
-            // // get team
-            if ($team->id !== $execution->scheduledDatabaseBackup->database->team()->id) {
+            $execution_team_id = $execution->scheduledDatabaseBackup->database->team()?->id;
+            if (is_null($execution_team_id)) {
+                return response()->json(['message' => 'Team not found.'], 404);
+            }
+            if ($team->id !== $execution_team_id) {
                 return response()->json(['message' => 'Permission denied.'], 403);
             }
             if (is_null($execution)) {

From c36636bd2d6aceb45ca1127fd7257c1c29edd360 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 11:59:19 +0200
Subject: [PATCH 12/21] Add dispatch('refreshEnvs') to loadComposeFile method

---
 app/Livewire/Project/Application/General.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 6926e52cb..873422985 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -186,6 +186,7 @@ class General extends Component
             $this->dispatch('success', 'Docker compose file loaded.');
             $this->dispatch('compose_loaded');
             $this->dispatch('refresh_storages');
+            $this->dispatch('refreshEnvs');
         } catch (\Throwable $e) {
             $this->application->docker_compose_location = $this->initialDockerComposeLocation;
             $this->application->docker_compose_pr_location = $this->initialDockerComposePrLocation;

From 11baa97ef62066e99d7f88ca525b1bc6a9456613 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 12:04:32 +0200
Subject: [PATCH 13/21] Refactor services.php file to improve variable
 replacement logic

---
 bootstrap/helpers/services.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap/helpers/services.php b/bootstrap/helpers/services.php
index 8e3c0337e..26a69222a 100644
--- a/bootstrap/helpers/services.php
+++ b/bootstrap/helpers/services.php
@@ -18,7 +18,7 @@ function collectRegex(string $name)
 }
 function replaceVariables($variable)
 {
-    return $variable->replaceFirst('$', '')->replaceFirst('{', '')->replaceLast('}', '');
+    return $variable->before('}')->replaceFirst('$', '')->replaceFirst('{', '');
 }
 
 function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Application $oneService, bool $isInit = false)
@@ -27,7 +27,7 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Appli
         if ($oneService->getMorphClass() === 'App\Models\Application') {
             $workdir = $oneService->workdir();
             $server = $oneService->destination->server;
-        } else{
+        } else {
             $workdir = $oneService->service->workdir();
             $server = $oneService->service->server;
         }

From 2644efd9f724352a08492da3ce942eced062879e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 12:54:36 +0200
Subject: [PATCH 14/21] Update input.blade.php and health-checks.blade.php

---
 resources/views/components/forms/input.blade.php |  1 +
 .../project/shared/health-checks.blade.php       | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index 2c6c1ef49..04b4a41c6 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -41,6 +41,7 @@
             wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
             wire:dirty.class="dark:focus:ring-warning dark:ring-warning" wire:loading.attr="disabled"
             type="{{ $type }}" @disabled($disabled)
+            min="{{ $attributes->get('min') }}" max="{{ $attributes->get('max') }}"
             @if ($id !== 'null') id={{ $id }} @endif name="{{ $name }}"
             placeholder="{{ $attributes->get('placeholder') }}">
     @endif
diff --git a/resources/views/livewire/project/shared/health-checks.blade.php b/resources/views/livewire/project/shared/health-checks.blade.php
index e666bb619..196a20779 100644
--- a/resources/views/livewire/project/shared/health-checks.blade.php
+++ b/resources/views/livewire/project/shared/health-checks.blade.php
@@ -10,22 +10,24 @@
         </div>
         <div class="flex gap-2">
             <x-forms.input id="resource.health_check_method" placeholder="GET" label="Method" required />
-
             <x-forms.input id="resource.health_check_scheme" placeholder="http" label="Scheme" required />
             <x-forms.input id="resource.health_check_host" placeholder="localhost" label="Host" required />
-            <x-forms.input id="resource.health_check_port"
+            <x-forms.input type="number" id="resource.health_check_port"
                 helper="If no port is defined, the first exposed port will be used." placeholder="80" label="Port" />
             <x-forms.input id="resource.health_check_path" placeholder="/health" label="Path" required />
         </div>
         <div class="flex gap-2">
-            <x-forms.input id="resource.health_check_return_code" placeholder="200" label="Return Code" required />
+            <x-forms.input type="number" id="resource.health_check_return_code" placeholder="200" label="Return Code" required />
             <x-forms.input id="resource.health_check_response_text" placeholder="OK" label="Response Text" />
         </div>
         <div class="flex gap-2">
-            <x-forms.input id="resource.health_check_interval" placeholder="30" label="Interval" required />
-            <x-forms.input id="resource.health_check_timeout" placeholder="30" label="Timeout" required />
-            <x-forms.input id="resource.health_check_retries" placeholder="3" label="Retries" required />
-            <x-forms.input id="resource.health_check_start_period" placeholder="30" label="Start Period" required />
+            <x-forms.input min=1 type="number" id="resource.health_check_interval" placeholder="30" label="Interval"
+                required />
+            <x-forms.input type="number" id="resource.health_check_timeout" placeholder="30" label="Timeout"
+                required />
+            <x-forms.input type="number" id="resource.health_check_retries" placeholder="3" label="Retries" required />
+            <x-forms.input min=1 type="number" id="resource.health_check_start_period" placeholder="30"
+                label="Start Period" required />
         </div>
     </div>
 </form>

From d400ac57d537a7c090f62eb237dd7aa2bce9fd37 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 12:54:58 +0200
Subject: [PATCH 15/21] disable hc by default for some build packs

---
 app/Livewire/Project/New/PublicGitRepository.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index 8bbb5b052..afc345db2 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -170,7 +170,6 @@ class PublicGitRepository extends Component
                     'name' => generate_random_name(),
                     'git_repository' => $this->git_repository,
                     'git_branch' => $this->git_branch,
-                    'build_pack' => 'nixpacks',
                     'ports_exposes' => $this->port,
                     'publish_directory' => $this->publish_directory,
                     'environment_id' => $environment->id,
@@ -183,7 +182,6 @@ class PublicGitRepository extends Component
                     'name' => generate_application_name($this->git_repository, $this->git_branch),
                     'git_repository' => $this->git_repository,
                     'git_branch' => $this->git_branch,
-                    'build_pack' => 'nixpacks',
                     'ports_exposes' => $this->port,
                     'publish_directory' => $this->publish_directory,
                     'environment_id' => $environment->id,
@@ -194,7 +192,9 @@ class PublicGitRepository extends Component
                     'build_pack' => $this->build_pack,
                 ];
             }
-
+            if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage' || $this->application->dockerfile) {
+                $application_init['health_check_enabled'] = false;
+            }
 
             $application = Application::create($application_init);
 

From 0c516843d80b10b0be9c38e9141104f189fbdc7d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 12:55:10 +0200
Subject: [PATCH 16/21] Update health check validation rules in
 HealthChecks.php

---
 app/Livewire/Project/Shared/HealthChecks.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Livewire/Project/Shared/HealthChecks.php b/app/Livewire/Project/Shared/HealthChecks.php
index 3bf507cab..bd16ee577 100644
--- a/app/Livewire/Project/Shared/HealthChecks.php
+++ b/app/Livewire/Project/Shared/HealthChecks.php
@@ -17,9 +17,9 @@ class HealthChecks extends Component
         'resource.health_check_return_code' => 'integer',
         'resource.health_check_scheme' => 'string',
         'resource.health_check_response_text' => 'nullable|string',
-        'resource.health_check_interval' => 'integer',
-        'resource.health_check_timeout' => 'integer',
-        'resource.health_check_retries' => 'integer',
+        'resource.health_check_interval' => 'integer|min:1',
+        'resource.health_check_timeout' => 'integer|min:1',
+        'resource.health_check_retries' => 'integer|min:1',
         'resource.health_check_start_period' => 'integer',
 
     ];

From 05c6d67cabada767cd3130d990788eb8edcf212e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 12:55:38 +0200
Subject: [PATCH 17/21] fix: respect start period and chekc interval for hc

---
 app/Jobs/ApplicationDeploymentJob.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 1717c5d08..60cd35f3b 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -914,6 +914,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 if ($this->full_healthcheck_url) {
                     $this->application_deployment_queue->addLogEntry("Healthcheck URL (inside the container): {$this->full_healthcheck_url}");
                 }
+                $this->application_deployment_queue->addLogEntry("Waiting for the start period ({$this->application->health_check_start_period} seconds) before starting healthcheck.");
+                $sleeptime = 0;
+                while ($sleeptime < $this->application->health_check_start_period) {
+                    Sleep::for(1)->seconds();
+                    $sleeptime++;
+                }
                 while ($counter <= $this->application->health_check_retries) {
                     $this->execute_remote_command(
                         [
@@ -936,7 +942,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         break;
                     }
                     $counter++;
-                    Sleep::for($this->application->health_check_interval)->seconds();
+                    $sleeptime = 0;
+                    while ($sleeptime < $this->application->health_check_interval) {
+                        Sleep::for(1)->seconds();
+                        $sleeptime++;
+                    }
                 }
             }
         }
@@ -1595,10 +1605,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function generate_healthcheck_commands()
     {
-        if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
-            // TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
-            return 'exit 0';
-        }
+        // if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
+        //     // TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
+        //     return 'exit 0';
+        // }
         if (!$this->application->health_check_port) {
             $health_check_port = $this->application->ports_exposes_array[0];
         } else {

From 16278f36ec69f55b3f1de9fb754eac9678f40b68 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 13:33:28 +0200
Subject: [PATCH 18/21] fix: parse HEALTHCHECK from dockerfile

---
 app/Jobs/ApplicationDeploymentJob.php         | 35 +++++++-------
 app/Livewire/Project/New/SimpleDockerfile.php |  2 +
 app/Livewire/Project/Shared/HealthChecks.php  |  3 +-
 app/Models/Application.php                    | 47 +++++++++++++++++++
 .../Application/DeploymentFailed.php          |  8 ++--
 ...29_111956_add_custom_hc_indicator_apps.php | 28 +++++++++++
 .../project/shared/health-checks.blade.php    |  6 ++-
 7 files changed, 104 insertions(+), 25 deletions(-)
 create mode 100644 database/migrations/2024_04_29_111956_add_custom_hc_indicator_apps.php

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 60cd35f3b..efa906388 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -95,7 +95,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private ?string $buildTarget = null;
     private Collection $saved_outputs;
     private ?string $full_healthcheck_url = null;
-    private bool $custom_healthcheck_found = false;
 
     private string $serverUser = 'root';
     private string $serverUserHomeDir = '/root';
@@ -903,10 +902,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->server->isSwarm()) {
             // Implement healthcheck for swarm
         } else {
-            if ($this->application->isHealthcheckDisabled() && $this->custom_healthcheck_found === false) {
+            if ($this->application->isHealthcheckDisabled() && $this->application->custom_healthcheck_found === false) {
                 $this->newVersionIsHealthy = true;
                 return;
             }
+            if ($this->application->custom_healthcheck_found) {
+                $this->application_deployment_queue->addLogEntry("Custom healthcheck found, skipping default healthcheck.");
+            }
             // ray('New container name: ', $this->container_name);
             if ($this->container_name) {
                 $counter = 1;
@@ -1272,16 +1274,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             return escapeDollarSign($value);
         });
         $labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();
+
         // Check for custom HEALTHCHECK
-        $this->custom_healthcheck_found = false;
         if ($this->application->build_pack === 'dockerfile' || $this->application->dockerfile) {
             $this->execute_remote_command([
                 executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile_from_repo', "ignore_errors" => true
             ]);
             $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile_from_repo'))->trim()->explode("\n"));
-            if (str($dockerfile)->contains('HEALTHCHECK')) {
-                $this->custom_healthcheck_found = true;
-            }
+            $this->application->parseHealthcheckFromDockerfile($dockerfile);
         }
         $docker_compose = [
             'version' => '3.8',
@@ -1327,18 +1327,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if (!is_null($this->env_filename)) {
             $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
         }
-        if (!$this->custom_healthcheck_found) {
-            $docker_compose['services'][$this->container_name]['healthcheck'] = [
-                'test' => [
-                    'CMD-SHELL',
-                    $this->generate_healthcheck_commands()
-                ],
-                'interval' => $this->application->health_check_interval . 's',
-                'timeout' => $this->application->health_check_timeout . 's',
-                'retries' => $this->application->health_check_retries,
-                'start_period' => $this->application->health_check_start_period . 's'
-            ];
-        }
+        $docker_compose['services'][$this->container_name]['healthcheck'] = [
+            'test' => [
+                'CMD-SHELL',
+                $this->generate_healthcheck_commands()
+            ],
+            'interval' => $this->application->health_check_interval . 's',
+            'timeout' => $this->application->health_check_timeout . 's',
+            'retries' => $this->application->health_check_retries,
+            'start_period' => $this->application->health_check_start_period . 's'
+        ];
+
         if (!is_null($this->application->limits_cpuset)) {
             data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset);
         }
diff --git a/app/Livewire/Project/New/SimpleDockerfile.php b/app/Livewire/Project/New/SimpleDockerfile.php
index 55b48041a..172403a1a 100644
--- a/app/Livewire/Project/New/SimpleDockerfile.php
+++ b/app/Livewire/Project/New/SimpleDockerfile.php
@@ -70,6 +70,8 @@ CMD ["nginx", "-g", "daemon off;"]
             'fqdn' => $fqdn
         ]);
 
+        $application->parseHealthcheckFromDockerfile(dockerfile: collect(str($this->dockerfile)->trim()->explode("\n")), isInit: true);
+
         return redirect()->route('project.application.configuration', [
             'application_uuid' => $application->uuid,
             'environment_name' => $environment->name,
diff --git a/app/Livewire/Project/Shared/HealthChecks.php b/app/Livewire/Project/Shared/HealthChecks.php
index bd16ee577..56f5a2759 100644
--- a/app/Livewire/Project/Shared/HealthChecks.php
+++ b/app/Livewire/Project/Shared/HealthChecks.php
@@ -21,14 +21,13 @@ class HealthChecks extends Component
         'resource.health_check_timeout' => 'integer|min:1',
         'resource.health_check_retries' => 'integer|min:1',
         'resource.health_check_start_period' => 'integer',
+        'resource.custom_healthcheck_found' => 'boolean',
 
     ];
     public function instantSave()
     {
         $this->resource->save();
         $this->dispatch('success', 'Health check updated.');
-
-
     }
     public function submit()
     {
diff --git a/app/Models/Application.php b/app/Models/Application.php
index f28d389f4..98b2c23b1 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -963,4 +963,51 @@ class Application extends BaseModel
     {
         getFilesystemVolumesFromServer($this, $isInit);
     }
+
+    public function parseHealthcheckFromDockerfile($dockerfile, bool $isInit = false) {
+        if (str($dockerfile)->contains('HEALTHCHECK') && ($this->isHealthcheckDisabled() || $isInit)) {
+            $healthcheckCommand = null;
+            $lines = $dockerfile->toArray();
+            foreach ($lines as $line) {
+                $trimmedLine = trim($line);
+                if (str_starts_with($trimmedLine, 'HEALTHCHECK')) {
+                    $healthcheckCommand .= trim($trimmedLine, '\\ ');
+                    continue;
+                }
+                if (isset($healthcheckCommand) && str_contains($trimmedLine, '\\')) {
+                    $healthcheckCommand .= ' ' . trim($trimmedLine, '\\ ');
+                }
+                if (isset($healthcheckCommand) && !str_contains($trimmedLine, '\\') && !empty($healthcheckCommand)) {
+                    $healthcheckCommand .= ' ' . $trimmedLine;
+                    break;
+                }
+            }
+            if (str($healthcheckCommand)->isNotEmpty()) {
+                $interval = str($healthcheckCommand)->match('/--interval=(\d+)/');
+                $timeout = str($healthcheckCommand)->match('/--timeout=(\d+)/');
+                $start_period = str($healthcheckCommand)->match('/--start-period=(\d+)/');
+                $start_interval = str($healthcheckCommand)->match('/--start-interval=(\d+)/');
+                $retries = str($healthcheckCommand)->match('/--retries=(\d+)/');
+                if ($interval->isNotEmpty()) {
+                    $this->health_check_interval = $interval->toInteger();
+                }
+                if ($timeout->isNotEmpty()) {
+                    $this->health_check_timeout = $timeout->toInteger();
+                }
+                if ($start_period->isNotEmpty()) {
+                    $this->health_check_start_period = $start_period->toInteger();
+                }
+                // if ($start_interval) {
+                //     $this->health_check_start_interval = $start_interval->value();
+                // }
+                if ($retries->isNotEmpty()) {
+                    $this->health_check_retries = $retries->toInteger();
+                }
+                if ($interval || $timeout || $start_period || $start_interval || $retries) {
+                    $this->custom_healthcheck_found = true;
+                    $this->save();
+                }
+            }
+        }
+    }
 }
diff --git a/app/Notifications/Application/DeploymentFailed.php b/app/Notifications/Application/DeploymentFailed.php
index 1705deda1..05fe544d0 100644
--- a/app/Notifications/Application/DeploymentFailed.php
+++ b/app/Notifications/Application/DeploymentFailed.php
@@ -69,10 +69,10 @@ class DeploymentFailed extends Notification implements ShouldQueue
     public function toDiscord(): string
     {
         if ($this->preview) {
-            $message = 'Coolify:  Pull request #' . $this->preview->pull_request_id . ' of **' . $this->application_name . '** (' . $this->preview->fqdn . ') deployment failed: ';
+            $message = 'Coolify:  Pull request #' . $this->preview->pull_request_id . ' of ' . $this->application_name . ' (' . $this->preview->fqdn . ') deployment failed: ';
             $message .= '[View Deployment Logs](' . $this->deployment_url . ')';
         } else {
-            $message = 'Coolify: Deployment failed of **' . $this->application_name . '** (' . $this->fqdn . '): ';
+            $message = 'Coolify: Deployment failed of ' . $this->application_name . ' (' . $this->fqdn . '): ';
             $message .= '[View Deployment Logs](' . $this->deployment_url . ')';
         }
         return $message;
@@ -80,9 +80,9 @@ class DeploymentFailed extends Notification implements ShouldQueue
     public function toTelegram(): array
     {
         if ($this->preview) {
-            $message = 'Coolify: Pull request #' . $this->preview->pull_request_id . ' of **' . $this->application_name . '** (' . $this->preview->fqdn . ') deployment failed: ';
+            $message = 'Coolify: Pull request #' . $this->preview->pull_request_id . ' of ' . $this->application_name . ' (' . $this->preview->fqdn . ') deployment failed: ';
         } else {
-            $message = 'Coolify: Deployment failed of **' . $this->application_name . '** (' . $this->fqdn . '): ';
+            $message = 'Coolify: Deployment failed of ' . $this->application_name . ' (' . $this->fqdn . '): ';
         }
         $buttons[] = [
             "text" => "Deployment logs",
diff --git a/database/migrations/2024_04_29_111956_add_custom_hc_indicator_apps.php b/database/migrations/2024_04_29_111956_add_custom_hc_indicator_apps.php
new file mode 100644
index 000000000..b5a97f0eb
--- /dev/null
+++ b/database/migrations/2024_04_29_111956_add_custom_hc_indicator_apps.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->boolean('custom_healthcheck_found')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn('custom_healthcheck_found');
+        });
+    }
+};
diff --git a/resources/views/livewire/project/shared/health-checks.blade.php b/resources/views/livewire/project/shared/health-checks.blade.php
index 196a20779..6b6e02a4e 100644
--- a/resources/views/livewire/project/shared/health-checks.blade.php
+++ b/resources/views/livewire/project/shared/health-checks.blade.php
@@ -5,6 +5,9 @@
     </div>
     <div class="pb-4">Define how your resource's health should be checked.</div>
     <div class="flex flex-col gap-4">
+        @if ($resource->custom_healthcheck_found)
+            <div class="text-warning">A custom health check has been found and will be used until you enable this.</div>
+        @endif
         <div class="w-32">
             <x-forms.checkbox instantSave id="resource.health_check_enabled" label="Enabled" />
         </div>
@@ -17,7 +20,8 @@
             <x-forms.input id="resource.health_check_path" placeholder="/health" label="Path" required />
         </div>
         <div class="flex gap-2">
-            <x-forms.input type="number" id="resource.health_check_return_code" placeholder="200" label="Return Code" required />
+            <x-forms.input type="number" id="resource.health_check_return_code" placeholder="200" label="Return Code"
+                required />
             <x-forms.input id="resource.health_check_response_text" placeholder="OK" label="Response Text" />
         </div>
         <div class="flex gap-2">

From 57d67bc4a8a6aac3f3424d5aa9a24b37dcc41842 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 29 Apr 2024 13:43:45 +0200
Subject: [PATCH 19/21] Fix repository URL handling in PublicGitRepository.php
 and public-git-repository.blade.php

---
 app/Livewire/Project/New/PublicGitRepository.php       | 10 +++++++---
 .../project/new/public-git-repository.blade.php        |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index afc345db2..0578421b5 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -94,6 +94,13 @@ class PublicGitRepository extends Component
                 $repository = str($this->repository_url)->after(':')->before('.git');
                 $this->repository_url = 'https://' . str($github_instance) . '/' . $repository;
             }
+            if (
+                (str($this->repository_url)->startsWith('https://') ||
+                    str($this->repository_url)->startsWith('http://')) &&
+                !str($this->repository_url)->endsWith('.git')
+            ) {
+                $this->repository_url = $this->repository_url . '.git';
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -192,9 +199,6 @@ class PublicGitRepository extends Component
                     'build_pack' => $this->build_pack,
                 ];
             }
-            if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage' || $this->application->dockerfile) {
-                $application_init['health_check_enabled'] = false;
-            }
 
             $application = Application::create($application_init);
 
diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php
index da09c1dd6..d27e3f259 100644
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@@ -3,7 +3,7 @@
     <div class="pb-4">Deploy any public Git repositories.</div>
     <form class="flex flex-col gap-2" wire:submit='load_branch'>
         <div class="flex flex-col gap-2">
-            <div class="flex flex-col">
+            <div class="flex flex-col gap-2">
                 <div class="flex items-end gap-2">
                     <x-forms.input required id="repository_url" label="Repository URL (https://)" helper="{!! __('repository.url') !!}" />
                     <x-forms.button type="submit">

From 4af766162e5b07c46433c66c263af46a4a7d146a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 30 Apr 2024 11:11:06 +0200
Subject: [PATCH 20/21] Fix repository URL handling in PublicGitRepository.php

---
 app/Livewire/Project/New/PublicGitRepository.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index 0578421b5..c6c699acf 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -97,10 +97,14 @@ class PublicGitRepository extends Component
             if (
                 (str($this->repository_url)->startsWith('https://') ||
                     str($this->repository_url)->startsWith('http://')) &&
-                !str($this->repository_url)->endsWith('.git')
+                !str($this->repository_url)->endsWith('.git') &&
+                !str($this->repository_url)->contains('github.com')
             ) {
                 $this->repository_url = $this->repository_url . '.git';
             }
+            if (str($this->repository_url)->contains('github.com')) {
+                $this->repository_url = str($this->repository_url)->before('.git')->value();
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

From 080db4d462c676ff01496e5999437597bbb5796b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 30 Apr 2024 11:20:57 +0200
Subject: [PATCH 21/21] Remove dispatch('configurationChanged') from
 check_status method in Heading.php

---
 app/Livewire/Project/Application/Heading.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index 0717a51f0..0b1e6edf5 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -39,7 +39,8 @@ class Heading extends Component
         }
 
         if ($showNotification) $this->dispatch('success', "Success", "Application status updated.");
-        $this->dispatch('configurationChanged');
+        // Removed because it caused flickering
+        // $this->dispatch('configurationChanged');
     }
 
     public function force_deploy_without_cache()