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

fix(file-storage): double save on compose volumes

Browse Source
This commit is contained in:
Andras Bacsai
2025-03-28 22:10:33 +01:00
parent 0bb47dfa56
commit c2941abe57
2 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Models/LocalFileVolume.php
View File

@@ -176,4 +176,19 @@ class LocalFileVolume extends BaseModel
return instant_remote_process($commands, $server); return instant_remote_process($commands, $server);
} }
// Accessor for convenient access
protected function plainMountPath(): Attribute
{
return Attribute::make(
get: fn () => $this->mount_path,
set: fn ($value) => $this->mount_path = $value
);
}
// Scope for searching
public function scopeWherePlainMountPath($query, $path)
{
return $query->get()->where('plain_mount_path', $path);
}
} }

49
bootstrap/helpers/shared.php
View File

@@ -1363,21 +1363,15 @@ function parseServiceVolumes($serviceVolumes, $resource, $topLevelVolumes, $pull
$source = $source."-pr-$pull_request_id"; $source = $source."-pr-$pull_request_id";
} }
if (! $resource?->settings?->is_preserve_repository_enabled || $foundConfig?->is_based_on_git) { if (! $resource?->settings?->is_preserve_repository_enabled || $foundConfig?->is_based_on_git) {
LocalFileVolume::updateOrCreate( $volume = LocalFileVolume::wherePlainMountPath($target)->first() ?? new LocalFileVolume;
[ $volume->fill([
'mount_path' => $target,
'resource_id' => $resource->id,
'resource_type' => get_class($resource),
],
[
'fs_path' => $source, 'fs_path' => $source,
'mount_path' => $target, 'mount_path' => $target,
'content' => $content, 'content' => $content,
'is_directory' => $isDirectory, 'is_directory' => $isDirectory,
'resource_id' => $resource->id, 'resource_id' => $resource->id,
'resource_type' => get_class($resource), 'resource_type' => get_class($resource),
] ])->save();
);
} }
} elseif ($type->value() === 'volume') { } elseif ($type->value() === 'volume') {
if ($topLevelVolumes->has($source->value())) { if ($topLevelVolumes->has($source->value())) {
@@ -1675,21 +1669,28 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
if ($source->value() === '/tmp' || $source->value() === '/tmp/') { if ($source->value() === '/tmp' || $source->value() === '/tmp/') {
return $volume; return $volume;
} }
LocalFileVolume::updateOrCreate(
[ $existingVolume = LocalFileVolume::wherePlainMountPath($target)->first();
'mount_path' => $target,
'resource_id' => $savedService->id, if ($existingVolume) {
'resource_type' => get_class($savedService), $existingVolume->update([
],
[
'fs_path' => $source, 'fs_path' => $source,
'mount_path' => $target, 'mount_path' => $target,
'content' => $content, 'content' => $content,
'is_directory' => $isDirectory, 'is_directory' => $isDirectory,
'resource_id' => $savedService->id, 'resource_id' => $savedService->id,
'resource_type' => get_class($savedService), 'resource_type' => get_class($savedService),
] ]);
); } else {
LocalFileVolume::create([
'fs_path' => $source,
'mount_path' => $target,
'content' => $content,
'is_directory' => $isDirectory,
'resource_id' => $savedService->id,
'resource_type' => get_class($savedService),
]);
}
} elseif ($type->value() === 'volume') { } elseif ($type->value() === 'volume') {
if ($topLevelVolumes->has($source->value())) { if ($topLevelVolumes->has($source->value())) {
$v = $topLevelVolumes->get($source->value()); $v = $topLevelVolumes->get($source->value());
@@ -3327,21 +3328,15 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
if ($isApplication && $isPullRequest) { if ($isApplication && $isPullRequest) {
$source = $source."-pr-$pullRequestId"; $source = $source."-pr-$pullRequestId";
} }
LocalFileVolume::updateOrCreate( $volume = LocalFileVolume::wherePlainMountPath($target)->first() ?? new LocalFileVolume;
[ $volume->fill([
'mount_path' => $target,
'resource_id' => $originalResource->id,
'resource_type' => get_class($originalResource),
],
[
'fs_path' => $source, 'fs_path' => $source,
'mount_path' => $target, 'mount_path' => $target,
'content' => $content, 'content' => $content,
'is_directory' => $isDirectory, 'is_directory' => $isDirectory,
'resource_id' => $originalResource->id, 'resource_id' => $originalResource->id,
'resource_type' => get_class($originalResource), 'resource_type' => get_class($originalResource),
] ])->save();
);
if (isDev()) { if (isDev()) {
if ((int) $resource->compose_parsing_version >= 4) { if ((int) $resource->compose_parsing_version >= 4) {
if ($isApplication) { if ($isApplication) {