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

fix: parser

Browse Source 
feat: new coolify envs for fqdn and urls
This commit is contained in:
Andras Bacsai
2024-08-28 18:12:00 +02:00
parent 43f2f1ef2b
commit be8a8bf2ee
4 changed files with 156 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Application.php
View File

@@ -1089,7 +1089,7 @@ class Application extends BaseModel
public function newParser(int $pull_request_id = 0, ?int $preview_id = null)
{
return newParser($this, $pull_request_id, $preview_id);
// return newParser($this, $pull_request_id, $preview_id);
// $pullRequestId = $pull_request_id;
// $isPullRequest = $pullRequestId == 0 ? false : true;
@@ -1630,7 +1630,7 @@ class Application extends BaseModel
public function oldParser(int $pull_request_id = 0, ?int $preview_id = null)
{
if ($this->compose_parsing_version === '3') {
return $this->newParser($pull_request_id, $preview_id);
return newParser($this, $pull_request_id, $preview_id);
} elseif ($this->docker_compose_raw) {
return parseDockerComposeFile(resource: $this, isNew: false, pull_request_id: $pull_request_id, preview_id: $preview_id);
} else {

6
app/Models/Service.php
View File

@@ -995,10 +995,8 @@ class Service extends BaseModel
instant_remote_process($commands, $this->server);
}
public function newParser(): Collection
public function newParser()
{
return newParser($this);
// $uuid = data_get($this, 'uuid');
// $server = data_get($this, 'destination.server');
// $compose = data_get($this, 'docker_compose_raw');
@@ -1526,7 +1524,7 @@ class Service extends BaseModel
public function parse(bool $isNew = false): Collection
{
if ($this->compose_parsing_version === '3') {
return $this->newParser();
return newParser($this);
} elseif ($this->docker_compose_raw) {
return parseDockerComposeFile($this, $isNew);
} else {