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

Refactor gitCommitLink method in Application model

Browse Source
This commit is contained in:
Andras Bacsai
2024-05-17 10:12:05 +02:00
parent e2ba5abe76
commit 5b56249d12
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Application.php
View File

@@ -192,10 +192,16 @@ class Application extends BaseModel
public function gitCommitLink($link): string public function gitCommitLink($link): string
{ {
if (!is_null($this->source?->html_url) && !is_null($this->git_repository) && !is_null($this->git_branch)) { if (!is_null($this->source?->html_url) && !is_null($this->git_repository) && !is_null($this->git_branch)) {
if (str($this->source->html_url)->contains('bitbucket')) {
return "{$this->source->html_url}/{$this->git_repository}/commits/{$link}";
}
return "{$this->source->html_url}/{$this->git_repository}/commit/{$link}"; return "{$this->source->html_url}/{$this->git_repository}/commit/{$link}";
} }
if (strpos($this->git_repository, 'git@') === 0) { if (strpos($this->git_repository, 'git@') === 0) {
$git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository); $git_repository = str_replace(['git@', ':', '.git'], ['', '/', ''], $this->git_repository);
if (str($this->source->html_url)->contains('bitbucket')) {
return "https://{$git_repository}/commits/{$link}";
}
return "https://{$git_repository}/commit/{$link}"; return "https://{$git_repository}/commit/{$link}";
} }
return $this->git_repository; return $this->git_repository;
@@ -993,7 +999,8 @@ class Application extends BaseModel
getFilesystemVolumesFromServer($this, $isInit); getFilesystemVolumesFromServer($this, $isInit);
} }
public function parseHealthcheckFromDockerfile($dockerfile, bool $isInit = false) { public function parseHealthcheckFromDockerfile($dockerfile, bool $isInit = false)
{
if (str($dockerfile)->contains('HEALTHCHECK') && ($this->isHealthcheckDisabled() || $isInit)) { if (str($dockerfile)->contains('HEALTHCHECK') && ($this->isHealthcheckDisabled() || $isInit)) {
$healthcheckCommand = null; $healthcheckCommand = null;
$lines = $dockerfile->toArray(); $lines = $dockerfile->toArray();