Merge pull request #1416 from coollabsio/next

v4.0.0-beta.116

app/Actions/Application/StopApplication.php

@@ -3,7 +3,6 @@
 namespace App\Actions\Application;
 
 use App\Models\Application;
-use App\Notifications\Application\StatusChanged;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class StopApplication
@@ -12,7 +11,7 @@ class StopApplication
     public function handle(Application $application)
     {
         $server = $application->destination->server;
-        $containers = getCurrentApplicationContainerStatus($server, $application->id);
+        $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
         if ($containers->count() > 0) {
             foreach ($containers as $container) {
                 $containerName = data_get($container, 'Names');

app/Actions/Database/StartPostgresql.php

@@ -32,6 +32,8 @@ class StartPostgresql
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->generate_init_scripts();
+        $this->add_custom_conf();
+
         $docker_compose = [
             'version' => '3.8',
             'services' => [
@@ -96,6 +98,19 @@ class StartPostgresql
                 ];
             }
         }
+        if (!is_null($this->database->postgres_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-postgres.conf',
+                'target' => '/etc/postgresql/postgresql.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] = [
+                'postgres',
+                '-c',
+                'config_file=/etc/postgresql/postgresql.conf',
+            ];
+        }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
@@ -171,4 +186,14 @@ class StartPostgresql
             $this->init_scripts[] = "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
         }
     }
+    private function add_custom_conf()
+    {
+        if (is_null($this->database->postgres_conf)) {
+            return;
+        }
+        $filename = 'custom-postgres.conf';
+        $content = $this->database->postgres_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
 }

app/Http/Livewire/Project/CloneProject.php

@@ -105,6 +105,7 @@ class CloneProject extends Component
                 $newDatabase = $database->replicate()->fill([
                     'uuid' => $uuid,
                     'status' => 'exited',
+                    'started_at' => null,
                     'environment_id' => $newEnvironment->id,
                     'destination_id' => $this->selectedServer,
                 ]);

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

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneMariadb $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -41,9 +42,20 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
     public function submit()
     {
         try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
             $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
@@ -66,12 +78,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -83,11 +96,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
-
     public function render()
     {
         return view('livewire.project.database.mariadb.general');

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

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneMongodb $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -39,13 +40,25 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
+
     public function submit()
     {
         try {
-            $this->validate();
-            if ($this->database->mongo_conf === "") {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
+            if (str($this->database->mongo_conf)->isEmpty()) {
                 $this->database->mongo_conf = null;
             }
+            $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
         } catch (Exception $e) {
@@ -67,12 +80,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -84,11 +98,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
-
     public function render()
     {
         return view('livewire.project.database.mongodb.general');

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

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneMysql $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -41,9 +42,20 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
     public function submit()
     {
         try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
             $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
@@ -66,12 +78,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -83,11 +96,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
-
     public function render()
     {
         return view('livewire.project.database.mysql.general');

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

@@ -15,7 +15,8 @@ class General extends Component
     public StandalonePostgresql $database;
     public string $new_filename;
     public string $new_content;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $listeners = ['refresh', 'save_init_script', 'delete_init_script'];
 
@@ -27,6 +28,7 @@ class General extends Component
         'database.postgres_db' => 'required',
         'database.postgres_initdb_args' => 'nullable',
         'database.postgres_host_auth_method' => 'nullable',
+        'database.postgres_conf' => 'nullable',
         'database.init_scripts' => 'nullable',
         'database.image' => 'required',
         'database.ports_mappings' => 'nullable',
@@ -41,6 +43,7 @@ class General extends Component
         'database.postgres_db' => 'Postgres DB',
         'database.postgres_initdb_args' => 'Postgres Initdb Args',
         'database.postgres_host_auth_method' => 'Postgres Host Auth Method',
+        'database.postgres_conf' => 'Postgres Configuration',
         'database.init_scripts' => 'Init Scripts',
         'database.image' => 'Image',
         'database.ports_mappings' => 'Port Mapping',
@@ -49,7 +52,10 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl();
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
     }
     public function instantSave()
     {
@@ -66,12 +72,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -91,7 +98,6 @@ class General extends Component
         $collection = collect($this->database->init_scripts);
         $found = $collection->firstWhere('filename', $script['filename']);
         if ($found) {
-            ray($collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray());
             $this->database->init_scripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray();
             $this->database->save();
             $this->refresh();
@@ -135,6 +141,9 @@ class General extends Component
     public function submit()
     {
         try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
             $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');

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

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneRedis $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -35,6 +36,13 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
     public function submit()
     {
         try {
@@ -63,12 +71,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -80,10 +89,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
     public function render()
     {
         return view('livewire.project.database.redis.general');

app/Http/Livewire/Project/Shared/Logs.php

@@ -31,7 +31,7 @@ class Logs extends Component
             $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
             $this->status = $this->resource->status;
             $this->server = $this->resource->destination->server;
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id);
+            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
             if ($containers->count() > 0) {
                 $this->container = data_get($containers[0], 'Names');
             }

app/Jobs/ApplicationDeploymentJob.php

@@ -52,7 +52,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private GithubApp|GitlabApp|string $source = 'other';
     private StandaloneDocker|SwarmDocker $destination;
     private Server $server;
-    private ApplicationPreview|null $preview = null;
+    private ?ApplicationPreview $preview = null;
 
     private string $container_name;
     private ?string $currently_running_container_name = null;
@@ -78,6 +78,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private string $dockerConfigFileExists = 'NOK';
 
     private int $customPort = 22;
+    private ?string $customRepository = null;
 
     private ?string $fullRepoUrl = null;
     private ?string $branch = null;
@@ -138,21 +139,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
-        // ray()->measure();
-        $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
-        if ($containers->count() === 1) {
-            $this->currently_running_container_name = data_get($containers[0], 'Names');
-        } else {
-            $foundContainer = $containers->filter(function ($container) {
-                return !str(data_get($container, 'Names'))->startsWith("{$this->application->uuid}-pr-");
-            })->first();
-            if ($foundContainer) {
-                $this->currently_running_container_name = data_get($foundContainer, 'Names');
-            }
-        }
-        if ($this->pull_request_id !== 0 && $this->pull_request_id !== null) {
-            $this->currently_running_container_name = $this->container_name;
-        }
         $this->application_deployment_queue->update([
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
         ]);
@@ -193,7 +179,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->customPort = $matches[0];
             $gitHost = str($this->application->git_repository)->before(':');
             $gitRepo = str($this->application->git_repository)->after('/');
-            $this->application->git_repository = "$gitHost:$gitRepo";
+            $this->customRepository = "$gitHost:$gitRepo";
+        } else {
+            $this->customRepository = $this->application->git_repository;
         }
         try {
             if ($this->restart_only) {
@@ -258,7 +246,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     //             executeInDocker($this->deployment_uuid, "echo '$dockercompose_base64' | base64 -d > $this->workdir/docker-compose.yaml")
     //         ],
     //     );
-    //     $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
+    //     $this->build_image_name = Str::lower("{$this->customRepository}:build");
     //     $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
     //     $this->save_environment_variables();
     //     $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
@@ -283,7 +271,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_image_names()
     {
         if ($this->application->dockerfile) {
-            $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
+            $this->build_image_name = Str::lower("{$this->application->uuid}:build");
             $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
         } else if ($this->application->build_pack === 'dockerimage') {
             $this->production_image_name = Str::lower("{$this->dockerImage}:{$this->dockerImageTag}");
@@ -295,7 +283,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if (strlen($tag) > 128) {
                 $tag = $tag->substr(0, 128);
             }
-            $this->build_image_name = Str::lower("{$this->application->git_repository}:{$tag}-build");
+            $this->build_image_name = Str::lower("{$this->application->uuid}:{$tag}-build");
             $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
         }
     }
@@ -303,7 +291,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->execute_remote_command(
             [
-                "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}.'"
+                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
             ],
         );
         $this->prepare_builder_image();
@@ -380,7 +368,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         $this->execute_remote_command(
             [
-                "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}.'"
+                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
             ],
         );
         $this->prepare_builder_image();
@@ -399,7 +387,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->execute_remote_command(
             [
-                "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}.'"
+                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
             ],
         );
         $this->prepare_builder_image();
@@ -499,9 +487,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_pull_request()
     {
+        $this->newVersionIsHealthy = true;
         $this->generate_image_names();
         $this->execute_remote_command([
-            "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->application->git_repository}:{$this->application->git_branch}.'",
+            "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.'",
         ]);
         $this->prepare_builder_image();
         $this->clone_repository();
@@ -515,12 +504,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         // $this->generate_build_env_variables();
         // $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        if ($this->currently_running_container_name) {
-            $this->execute_remote_command(
-                ["echo -n 'Removing old version of your application.'"],
-                [executeInDocker($this->deployment_uuid, "docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
-            );
-        }
+        $this->stop_running_container();
         $this->execute_remote_command(
             ["echo -n 'Starting preview deployment.'"],
             [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
@@ -599,7 +583,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $importCommands = $this->generate_git_import_commands();
         $this->execute_remote_command(
             [
-                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
+                "echo -n 'Importing {$this->customRepository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
             ],
             [
                 $importCommands, "hidden" => true
@@ -624,15 +608,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
             if ($this->source->getMorphClass() == 'App\Models\GithubApp') {
                 if ($this->source->is_public) {
-                    $this->fullRepoUrl = "{$this->source->html_url}/{$this->application->git_repository}";
-                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->application->git_repository} {$this->basedir}";
+                    $this->fullRepoUrl = "{$this->source->html_url}/{$this->customRepository}";
+                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->customRepository} {$this->basedir}";
                     $git_clone_command = $this->set_git_import_settings($git_clone_command);
 
                     $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
                 } else {
                     $github_access_token = generate_github_installation_token($this->source);
-                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->application->git_repository}.git {$this->basedir}"));
-                    $this->fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->application->git_repository}.git";
+                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->customRepository}.git {$this->basedir}"));
+                    $this->fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->customRepository}.git";
                 }
                 if ($this->pull_request_id !== 0) {
                     $this->branch = "pull/{$this->pull_request_id}/head:$pr_branch_name";
@@ -642,13 +626,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         if ($this->application->deploymentType() === 'deploy_key') {
-            $this->fullRepoUrl = $this->application->git_repository;
+            $this->fullRepoUrl = $this->customRepository;
             $private_key = data_get($this->application, 'private_key.private_key');
             if (is_null($private_key)) {
                 throw new Exception('Private key not found. Please add a private key to the application and try again.');
             }
             $private_key = base64_encode($private_key);
-            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_repository} {$this->basedir}";
+            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->customRepository} {$this->basedir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands = collect([
                 executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),
@@ -659,8 +643,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             return $commands->implode(' && ');
         }
         if ($this->application->deploymentType() === 'other') {
-            $this->fullRepoUrl = $this->application->git_repository;
-            $git_clone_command = "{$git_clone_command} {$this->application->git_repository} {$this->basedir}";
+            $this->fullRepoUrl = $this->customRepository;
+            $git_clone_command = "{$git_clone_command} {$this->customRepository} {$this->basedir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
             return $commands->implode(' && ');
@@ -882,11 +866,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             foreach ($this->application->runtime_environment_variables as $env) {
                 $environment_variables->push("$env->key=$env->value");
             }
+            foreach ($this->application->nixpacks_environment_variables as $env) {
+                $environment_variables->push("$env->key=$env->value");
+            }
         } else {
             // ray($this->application->runtime_environment_variables_preview)->green();
             foreach ($this->application->runtime_environment_variables_preview as $env) {
                 $environment_variables->push("$env->key=$env->value");
             }
+            foreach ($this->application->nixpacks_environment_variables_preview as $env) {
+                $environment_variables->push("$env->key=$env->value");
+            }
         }
         // Add PORT if not exists, use the first port as default
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
@@ -971,18 +961,30 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function stop_running_container(bool $force = false)
     {
-        if ($this->currently_running_container_name) {
-            if ($this->newVersionIsHealthy || $force) {
-                $this->execute_remote_command(
-                    ["echo -n 'Removing old version of your application.'"],
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
-                );
+        $this->execute_remote_command(["echo -n 'Removing old version of your application.'"]);
+
+        if ($this->newVersionIsHealthy || $force) {
+            $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
+            if ($this->pull_request_id !== 0) {
+                $containers = $containers->filter(function ($container) {
+                    return data_get($container, 'Names') === $this->container_name;
+                });
             } else {
-                $this->execute_remote_command(
-                    ["echo -n 'New version is not healthy, rolling back to the old version.'"],
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
-                );
+                $containers = $containers->filter(function ($container) {
+                    return data_get($container, 'Names') !== $this->container_name;
+                });
             }
+            $containers->each(function ($container) {
+                $containerName = data_get($container, 'Names');
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "docker rm -f $containerName >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+                );
+            });
+        } else {
+            $this->execute_remote_command(
+                ["echo -n 'New version is not healthy, rolling back to the old version.'"],
+                [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+            );
         }
     }
 
@@ -1048,8 +1050,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     {
         $this->execute_remote_command(
             ["echo 'Oops something is not okay, are you okay? 😢'"],
-            ["echo '{$exception->getMessage()}'"]
+            ["echo '{$exception->getMessage()}'"],
+            ["echo -n 'Deployment failed. Removing the new version of your application.'"],
+            [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
         );
+
         $this->next(ApplicationDeploymentStatus::FAILED->value);
     }
 }

app/Jobs/DatabaseBackupJob.php

@@ -36,6 +36,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database;
 
     public ?string $container_name = null;
+    public ?string $directory_name = null;
     public ?ScheduledDatabaseBackupExecution $backup_log = null;
     public string $backup_status = 'failed';
     public ?string $backup_location = null;
@@ -88,27 +89,98 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
                 $databaseType = $this->database->databaseType();
                 $serviceUuid = $this->database->service->uuid;
+                $serviceName = str($this->database->service->name)->slug();
                 if ($databaseType === 'standalone-postgresql') {
-                    $this->container_name = "postgresql-$serviceUuid";
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep POSTGRES_";
                     $envs = instant_remote_process($commands, $this->server);
-                    $databasesToBackup = Str::of($envs)->after('POSTGRES_DB=')->before("\n")->value();
-                    $this->database->postgres_user = Str::of($envs)->after('POSTGRES_USER=')->before("\n")->value();
+                    $envs = str($envs)->explode("\n");
+
+                    $user = $envs->filter(function ($env) {
+                        return str($env)->startsWith('POSTGRES_USER=');
+                    })->first();
+                    if ($user) {
+                        $this->database->postgres_user = str($user)->after('POSTGRES_USER=')->value();
+                    } else {
+                        $this->database->postgres_user = 'postgres';
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('POSTGRES_DB=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('POSTGRES_DB=')->value();
+                    } else {
+                        $databasesToBackup = $this->database->postgres_user;
+                    }
                 } else if ($databaseType === 'standalone-mysql') {
-                    $this->container_name = "mysql-$serviceUuid";
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep MYSQL_";
                     $envs = instant_remote_process($commands, $this->server);
-                    $databasesToBackup = Str::of($envs)->after('MYSQL_DATABASE=')->before("\n")->value();
-                    $this->database->mysql_root_password = Str::of($envs)->after('MYSQL_ROOT_PASSWORD=')->before("\n")->value();
+                    $envs = str($envs)->explode("\n");
+
+                    $rootPassword = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MYSQL_ROOT_PASSWORD=');
+                    })->first();
+                    if ($rootPassword) {
+                        $this->database->mysql_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MYSQL_DATABASE=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('MYSQL_DATABASE=')->value();
+                    } else {
+                        throw new \Exception('MYSQL_DATABASE not found');
+                    }
                 } else if ($databaseType === 'standalone-mariadb') {
-                    $this->container_name = "mariadb-$serviceUuid";
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep MARIADB_";
                     $envs = instant_remote_process($commands, $this->server);
-                    $databasesToBackup = Str::of($envs)->after('MARIADB_DATABASE=')->before("\n")->value();
-                    $this->database->mysql_root_password = Str::of($envs)->after('MARIADB_ROOT_PASSWORD=')->before("\n")->value();
+                    $envs = str($envs)->explode("\n");
+
+                    $rootPassword = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MARIADB_ROOT_PASSWORD=');
+                    })->first();
+                    if ($rootPassword) {
+                        $this->database->mysql_root_password = str($rootPassword)->after('MARIADB_ROOT_PASSWORD=')->value();
+                    } else {
+                        $rootPassword = $envs->filter(function ($env) {
+                            return str($env)->startsWith('MYSQL_ROOT_PASSWORD=');
+                        })->first();
+                        if ($rootPassword) {
+                            $this->database->mysql_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
+                        }
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MARIADB_DATABASE=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('MARIADB_DATABASE=')->value();
+                    } else {
+                        $db = $envs->filter(function ($env) {
+                            return str($env)->startsWith('MYSQL_DATABASE=');
+                        })->first();
+
+                        if ($db) {
+                            $databasesToBackup = str($db)->after('MYSQL_DATABASE=')->value();
+                        } else {
+                            throw new \Exception('MARIADB_DATABASE or MYSQL_DATABASE not found');
+                        }
+                    }
                 }
             } else {
+                $databaseName = str($this->database->name)->slug()->value();
                 $this->container_name = $this->database->uuid;
+                $this->directory_name = $databaseName . '-' . $this->container_name;
                 $databaseType = $this->database->type();
                 $databasesToBackup = data_get($this->backup, 'databases_to_backup');
             }
@@ -147,11 +219,11 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     return;
                 }
             }
-            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->container_name;
+            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->directory_name;
 
             if ($this->database->name === 'coolify-db') {
                 $databasesToBackup = ['coolify'];
-                $this->container_name = "coolify-db";
+                $this->directory_name = $this->container_name = "coolify-db";
                 $ip = Str::slug($this->server->ip);
                 $this->backup_dir = backup_dir() . "/coolify" . "/coolify-db-$ip";
             }

app/Notifications/Application/DeploymentFailed.php

@@ -84,11 +84,14 @@ class DeploymentFailed extends Notification implements ShouldQueue
         } else {
             $message = 'Coolify: Deployment failed of **' . $this->application_name . '** (' . $this->fqdn . '): ';
         }
+        $buttons[] = [
+            "text" => "Deployment logs",
+            "url" => $this->deployment_url
+        ];
         return [
             "message" => $message,
             "buttons" => [
-                "text" => "View Deployment Logs",
-                "url" => $this->deployment_url
+                ...$buttons
             ],
         ];
     }

bootstrap/helpers/docker.php

@@ -10,15 +10,24 @@ use Visus\Cuid2\Cuid2;
 
 function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null): Collection
 {
-    if ($pullRequestId) {
-        $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --filter='label=coolify.pullRequestId={$pullRequestId}' --format '{{json .}}' "], $server);
-    } else {
-        $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}'"], $server);
-    }
-    if (!$containers) {
-        return collect([]);
-    }
-    return format_docker_command_output_to_json($containers);
+    ray($id, $pullRequestId);
+    $containers = collect([]);
+    $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
+    $containers = format_docker_command_output_to_json($containers);
+    $containers = $containers->map(function ($container) use ($pullRequestId) {
+        $labels = data_get($container, 'Labels');
+        if (!str($labels)->contains("coolify.pullRequestId=")) {
+            data_set($container, 'Labels', $labels . ",coolify.pullRequestId={$pullRequestId}");
+            return $container;
+        }
+        if (str($labels)->contains("coolify.pullRequestId=$pullRequestId")) {
+            return $container;
+        }
+        return null;
+    });
+    $containers = $containers->filter();
+    ray($containers);
+    return $containers;
 }
 
 function format_docker_command_output_to_json($rawOutput): Collection
@@ -128,9 +137,7 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
     $labels->push("coolify." . $type . "Id=" . $id);
     $labels->push("coolify.type=$type");
     $labels->push('coolify.name=' . $name);
-    if ($pull_request_id !== 0) {
-        $labels->push('coolify.pullRequestId=' . $pull_request_id);
-    }
+    $labels->push('coolify.pullRequestId=' . $pull_request_id);
     if ($type === 'service') {
         $labels->push('coolify.service.subId=' . $subId);
         $labels->push('coolify.service.subType=' . $subType);

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.112',
+    'release' => '4.0.0-beta.116',
     // 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.112';
+return '4.0.0-beta.116';

database/migrations/2023_11_08_112815_add_custom_config_standalone_postgresql.php

@@ -0,0 +1,30 @@
+<?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('standalone_postgresqls', function (Blueprint $table) {
+            $table->longText('postgres_conf')->nullable();
+            $table->string('image')->default('postgres:16-alpine')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('standalone_postgresqls', function (Blueprint $table) {
+            $table->dropColumn('postgres_conf');
+            $table->string('image')->default('postgres:15-alpine')->change();
+        });
+    }
+};

resources/views/livewire/project/application/deployments.blade.php

@@ -13,7 +13,7 @@
     @forelse ($deployments as $deployment)
         <a @class([
             'bg-coolgray-200 p-2 border-l border-dashed transition-colors hover:no-underline',
-            'cursor-not-allowed hover:bg-coolgray-200' =>
+            'hover:bg-coolgray-200' =>
                 data_get($deployment, 'status') === 'queued' ||
                 data_get($deployment, 'status') === 'cancelled by system',
             'border-warning hover:bg-warning hover:text-black' =>

resources/views/livewire/project/application/general.blade.php

@@ -50,9 +50,9 @@
                 <h3>Build</h3>
                 @if ($application->could_set_build_commands())
                     @if ($application->build_pack === 'nixpacks')
-                        <div>Nixpacks will detect your package manager/configurations: <a class="underline"
-                                href="https://nixpacks.com/docs/providers">Nixpacks documentation</a></div>
-                        <div class="text-warning">You probably do not need to modify the commands below.</div>
+                        <div>Nixpacks will detect the required configuration automatically.
+                            <a class="underline" href="https://coolify.io/docs/frameworks">Framework Specific Docs</a>
+                        </div>
                         <div class="flex flex-col gap-2 xl:flex-row">
                             <x-forms.input placeholder="If you modify this, you probably need to have a nixpacks.toml"
                                 id="application.install_command" label="Install Command" />
@@ -72,7 +72,8 @@
                         <x-forms.input placeholder="/Dockerfile" id="application.dockerfile_location"
                             label="Dockerfile Location"
                             helper="It is calculated together with the Base Directory: {{ Str::start($application->base_directory . $application->dockerfile_location, '/') }}" />
-                        <x-forms.input id="application.dockerfile_target_build" label="Docker Build Stage Target" helper="Useful if you have multi-staged dockerfile." />
+                        <x-forms.input id="application.dockerfile_target_build" label="Docker Build Stage Target"
+                            helper="Useful if you have multi-staged dockerfile." />
                     @endif
                     @if ($application->could_set_build_commands())
                         @if ($application->settings->is_static)

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

@@ -49,9 +49,14 @@
                     label="Public Port" />
                 <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
             </div>
-            <x-forms.input label="MariaDB URL"
+            <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."
                 type="password" readonly wire:model="db_url" />
+            @if ($db_url_public)
+                <x-forms.input label="MariaDB URL (public)"
+                    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_public" />
+            @endif
         </div>
         <x-forms.textarea label="Custom MariaDB Configuration" rows="10" id="database.mariadb_conf" />
     </form>

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

@@ -43,9 +43,14 @@
                     label="Public Port" />
                 <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
             </div>
-            <x-forms.input label="Mongo URL"
+            <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."
                 type="password" readonly wire:model="db_url" />
+            @if ($db_url_public)
+            <x-forms.input label="Mongo URL (public)"
+            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_public" />
+            @endif
         </div>
         <x-forms.textarea label="Custom MongoDB Configuration" rows="10" id="database.mongo_conf" />
     </form>

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

@@ -49,9 +49,14 @@
                     label="Public Port" />
                 <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
             </div>
-            <x-forms.input label="MySQL URL"
+            <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."
                 type="password" readonly wire:model="db_url" />
+            @if ($db_url_public)
+                <x-forms.input label="MySQL URL (public)"
+                    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_public" />
+            @endif
         </div>
         <x-forms.textarea label="Custom Mysql Configuration" rows="10" id="database.mysql_conf" />
     </form>

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

@@ -31,14 +31,15 @@
             <div class="flex gap-2">
                 <x-forms.input label="Initial Username" id="database.postgres_username" placeholder="If empty: postgres"
                     readonly helper="You can only change this in the database." />
-                <x-forms.input label="Initial Password" id="database.postgres_password" type="password" required readonly
-                    helper="You can only change this in the database." />
+                <x-forms.input label="Initial Password" id="database.postgres_password" type="password" required
+                    readonly helper="You can only change this in the database." />
                 <x-forms.input label="Initial Database" id="database.postgres_db"
                     placeholder="If empty, it will be the same as Username." readonly
                     helper="You can only change this in the database." />
             </div>
         @else
-            <div class="pt-8 text-warning">Please verify these values. You can only modify them before the initial start. After that, you need to modify it in the database.
+            <div class="pt-8 text-warning">Please verify these values. You can only modify them before the initial
+                start. After that, you need to modify it in the database.
             </div>
             <div class="flex gap-2 pb-8">
                 <x-forms.input label="Username" id="database.postgres_user" placeholder="If empty: postgres" />
@@ -62,8 +63,16 @@
                     label="Public Port" />
                 <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
             </div>
-            <x-forms.input label="Postgres URL" 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" />
+            <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" />
+            @if ($db_url_public)
+                <x-forms.input label="Postgres URL (public)"
+                    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_public" />
+            @endif
         </div>
+        <x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" id="database.postgres_conf" />
     </form>
     <div class="pb-16">
         <div class="flex gap-2 pt-4 pb-2">

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

@@ -21,8 +21,17 @@
                     label="Public Port" />
                 <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
             </div>
-            <x-forms.input label="Redis URL" 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" />
+            <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."
+                type="password" readonly wire:model="db_url" />
+            @if ($db_url_public)
+                <x-forms.input label="Redis URL (public)"
+                    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_public" />
+            @endif
         </div>
-        <x-forms.textarea helper="<a target='_blank' class='text-white underline' 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" />
+        <x-forms.textarea
+            helper="<a target='_blank' class='text-white underline' 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" />
     </form>
 </div>

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

@@ -13,8 +13,13 @@
                 @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'; if(window.location.search) window.location.search = ''"
                 href="#">Storages
             </a>
-            <a :class="activeTab === 'backups' && 'text-white'"
-                @click.prevent="activeTab = 'backups'; window.location.hash = 'backups'" href="#">Backups</a>
+            @if (
+                $serviceDatabase?->databaseType() === 'standalone-mysql' ||
+                    $serviceDatabase?->databaseType() === 'standalone-postgresql' ||
+                    $serviceDatabase?->databaseType() === 'standalone-mariadb')
+                <a :class="activeTab === 'backups' && 'text-white'"
+                    @click.prevent="activeTab = 'backups'; window.location.hash = 'backups'" href="#">Backups</a>
+            @endif
             @if (data_get($parameters, 'service_name'))
                 <a class="{{ request()->routeIs('project.service.logs') ? 'text-white' : '' }}"
                     href="{{ route('project.service.logs', $parameters) }}">

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.112"
+            "version": "4.0.0-beta.116"
         }
     }
 }