cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-23 00:24:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1279 from coollabsio/next

Browse Source 
v4.0.0-beta.59
This commit is contained in:
Andras Bacsai 2023-10-02 18:03:07 +02:00 committed by GitHub
commit 51d0a30a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Livewire/Project/Service/Show.php
View File

@ -33,9 +33,6 @@ public function mount()
$this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
$this->serviceDatabase->getFilesFromServer();
}
if (is_null($service)) {
throw new \Exception("Service not found.");
}
} catch(\Throwable $e) {
return handleError($e, $this);
}

7
app/Models/Service.php
View File

@ -287,7 +287,10 @@ public function parse(bool $isNew = false): Collection
$isDirectory = (bool) data_get($volume, 'isDirectory', false);
$foundConfig = $savedService->fileStorages()->whereMountPath($target)->first();
if ($foundConfig) {
$content = data_get($foundConfig, 'content');
$contentNotNull = data_get($foundConfig, 'content');
if ($contentNotNull) {
$content = $contentNotNull;
}
$isDirectory = (bool) data_get($foundConfig, 'is_directory');
}
}
@ -343,7 +346,7 @@ public function parse(bool $isNew = false): Collection
]
);
}
$savedService->getFilesFromServer();
$savedService->getFilesFromServer(isInit: true);
return $volume;
});
data_set($service, 'volumes', $serviceVolumes->toArray());

4
app/Models/ServiceApplication.php
View File

@ -36,8 +36,8 @@ public function fqdns(): Attribute
);
}
public function getFilesFromServer()
public function getFilesFromServer(bool $isInit = false)
{
getFilesystemVolumesFromServer($this);
getFilesystemVolumesFromServer($this, $isInit);
}
}

4
app/Models/ServiceDatabase.php
View File

@ -26,8 +26,8 @@ public function fileStorages()
{
return $this->morphMany(LocalFileVolume::class, 'resource');
}
public function getFilesFromServer()
public function getFilesFromServer(bool $isInit = false)
{
getFilesystemVolumesFromServer($this);
getFilesystemVolumesFromServer($this, $isInit);
}
}

6
bootstrap/helpers/services.php
View File

@ -64,7 +64,7 @@ function serviceStatus(Service $service)
}
return 'exited';
}
function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneService)
function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneService, bool $isInit = false)
{
// TODO: make this async
try {
@ -87,6 +87,10 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneS
}
$isFile = instant_remote_process(["test -f $fileLocation && echo OK || echo NOK"], $server);
$isDir = instant_remote_process(["test -d $fileLocation && echo OK || echo NOK"], $server);
if ($isFile === 'NOK' &&!$fileVolume->is_directory && $isInit) {
$fileVolume->saveStorageOnServer($oneService);
continue;
}
if ($isFile == 'OK' && !$fileVolume->is_directory) {
$filesystemContent = instant_remote_process(["cat $fileLocation"], $server);
if (base64_encode($filesystemContent) != base64_encode($content)) {

2
config/sentry.php
View File

@ -7,7 +7,7 @@
// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.58',
'release' => '4.0.0-beta.59',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php
return '4.0.0-beta.58';
return '4.0.0-beta.59';

2
versions.json
View File

@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.58"
"version": "4.0.0-beta.59"
}
}
}