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

Merge branch 'main' into application-update-submodules-after-git-checkout

Browse Source
This commit is contained in:
Andras Bacsai
2024-04-08 13:40:16 +02:00
committed by GitHub
parent 9616d858cf aa2ac3865c
commit 884c46b054
56 changed files with 662 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Models/Application.php
View File

@@ -6,6 +6,7 @@ use App\Enums\ApplicationDeploymentStatus;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Collection;
use Spatie\Activitylog\Models\Activity;
use Illuminate\Support\Str;
use RuntimeException;
@@ -501,9 +502,9 @@ class Application extends BaseModel
{
$newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
$newConfigHash .= json_encode($this->environment_variables());
$newConfigHash .= json_encode($this->environment_variables()->get('updated_at'));
} else {
$newConfigHash .= json_encode($this->environment_variables_preview->all());
$newConfigHash .= json_encode($this->environment_variables_preview->get('updated_at'));
}
$newConfigHash = md5($newConfigHash);
$oldConfigHash = data_get($this, 'config_hash');
@@ -905,7 +906,6 @@ class Application extends BaseModel
: explode(',', $this->fqdn),
);
}
protected function buildGitCheckoutCommand($target): string {
$command = "git checkout $target";
@@ -914,5 +914,28 @@ class Application extends BaseModel
}
return $command;
public function watchPaths(): Attribute
{
return Attribute::make(
set: function ($value) {
if ($value) {
return trim($value);
}
}
);
}
public function isWatchPathsTriggered(Collection $modified_files): bool
{
if (is_null($this->watch_paths)) {
return false;
}
$watch_paths = collect(explode("\n", $this->watch_paths));
$matches = $modified_files->filter(function ($file) use ($watch_paths) {
return $watch_paths->contains(function ($glob) use ($file) {
return fnmatch($glob, $file);
});
});
return $matches->count() > 0;
}
}