diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 18b7dc6d1..05fa56ef2 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -566,7 +566,7 @@ COPY --from=$this->build_image_name /app/{$this->application->publish_directory} if ($this->pull_request_id !== 0) { $pr_branch_name = "pr-{$this->pull_request_id}-coolify"; } - + if ($this->application->deploymentType() === 'source') { $source_html_url = data_get($this->application, 'source.html_url'); $url = parse_url(filter_var($source_html_url, FILTER_SANITIZE_URL)); @@ -619,4 +619,4 @@ COPY --from=$this->build_image_name /app/{$this->application->publish_directory} ); $this->commit = $this->saved_outputs->get('git_commit_sha'); } -} +} \ No newline at end of file diff --git a/app/Models/Application.php b/app/Models/Application.php index 77bf0a5fb..f56a55f79 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -195,6 +195,9 @@ class Application extends BaseModel } public function deploymentType() { + if (data_get($this, 'private_key_id')) { + return 'deploy_key'; + } if (data_get($this, 'source')) { return 'source'; } @@ -203,4 +206,4 @@ class Application extends BaseModel } throw new \Exception('No deployment type found'); } -} +} \ No newline at end of file diff --git a/database/seeders/ServerSeeder.php b/database/seeders/ServerSeeder.php index 10a4a9c1d..927cee11c 100644 --- a/database/seeders/ServerSeeder.php +++ b/database/seeders/ServerSeeder.php @@ -38,4 +38,4 @@ class ServerSeeder extends Seeder 'private_key_id' => $private_key_1->id ]); } -} +} \ No newline at end of file diff --git a/database/seeders/ServerSettingSeeder.php b/database/seeders/ServerSettingSeeder.php index a4c0ac2ad..f2d8c9b49 100644 --- a/database/seeders/ServerSettingSeeder.php +++ b/database/seeders/ServerSettingSeeder.php @@ -14,6 +14,7 @@ class ServerSettingSeeder extends Seeder public function run(): void { $server_2 = Server::find(0)->load(['settings']); + $server_2->settings->wildcard_domain = 'http://127.0.0.1.sslip.io'; $server_2->settings->is_build_server = true; $server_2->settings->is_reachable = true; $server_2->settings->save(); @@ -23,4 +24,4 @@ class ServerSettingSeeder extends Seeder $server_3->settings->is_reachable = false; $server_3->settings->save(); } -} +} \ No newline at end of file