dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(deployment): add repository_project_id handling for private GitHub apps and clean up unused Caddy label logic

Browse Source
This commit is contained in:
Andras Bacsai
2025-04-22 10:20:57 +02:00
parent d731cdabdf
commit cd2f71b463
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -1377,6 +1377,17 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
private function check_git_if_build_needed() private function check_git_if_build_needed()
{ {
if ($this->source->getMorphClass() === \App\Models\GithubApp::class && $this->source->is_public === false) {
$repository = githubApi($this->source, "repos/{$this->customRepository}");
$data = data_get($repository, 'data');
if (isset($data->id)) {
$repository_project_id = $data->id;
if (blank($this->application->repository_project_id) || $this->application->repository_project_id !== $repository_project_id) {
$this->application->repository_project_id = $repository_project_id;
$this->application->save();
}
}
}
$this->generate_git_import_commands(); $this->generate_git_import_commands();
$local_branch = $this->branch; $local_branch = $this->branch;
if ($this->pull_request_id !== 0) { if ($this->pull_request_id !== 0) {
@@ -1712,25 +1723,6 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
$labels = $labels->filter(function ($value, $key) { $labels = $labels->filter(function ($value, $key) {
return ! Str::startsWith($value, 'coolify.'); return ! Str::startsWith($value, 'coolify.');
}); });
// $found_caddy_labels = $labels->filter(function ($value, $key) {
// return Str::startsWith($value, 'caddy_');
// });
// if ($found_caddy_labels->count() === 0) {
// if ($this->pull_request_id !== 0) {
// $domains = str(data_get($this->preview, 'fqdn'))->explode(',');
// } else {
// $domains = str(data_get($this->application, 'fqdn'))->explode(',');
// }
// $labels = $labels->merge(fqdnLabelsForCaddy(
// network: $this->application->destination->network,
// uuid: $this->application->uuid,
// domains: $domains,
// onlyPort: $onlyPort,
// is_force_https_enabled: $this->application->isForceHttpsEnabled(),
// is_gzip_enabled: $this->application->isGzipEnabled(),
// is_stripprefix_enabled: $this->application->isStripprefixEnabled()
// ));
// }
$this->application->custom_labels = base64_encode($labels->implode("\n")); $this->application->custom_labels = base64_encode($labels->implode("\n"));
$this->application->save(); $this->application->save();
} else { } else {

1
app/Livewire/Project/Application/Source.php
View File

@@ -111,6 +111,7 @@ class Source extends Component
$this->application->update([ $this->application->update([
'source_id' => $sourceId, 'source_id' => $sourceId,
'source_type' => $sourceType, 'source_type' => $sourceType,
'repository_project_id' => null,
]); ]);
$this->application->refresh(); $this->application->refresh();
$this->getSources(); $this->getSources();