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

fix(docker): Improve Docker compose file validation process

Browse Source 
- Increase UUID length for better uniqueness
- Add server existence check before validation
- Implement cleanup of temporary compose file in finally block
This commit is contained in:
Andras Bacsai
2025-02-27 12:17:12 +01:00
parent 64f44f3f8b
commit e1c5ace342
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bootstrap/helpers/docker.php
View File

@@ -834,9 +834,12 @@ function generateCustomDockerRunOptionsForDatabases($docker_run_options, $docker
function validateComposeFile(string $compose, int $server_id): string|Throwable function validateComposeFile(string $compose, int $server_id): string|Throwable
{ {
$uuid = Str::random(10); $uuid = Str::random(18);
$server = Server::ownedByCurrentTeam()->find($server_id);
try { try {
$server = Server::ownedByCurrentTeam()->findOrFail($server_id); if (! $server) {
throw new \Exception('Server not found');
}
$base64_compose = base64_encode($compose); $base64_compose = base64_encode($compose);
instant_remote_process([ instant_remote_process([
"echo {$base64_compose} | base64 -d | tee /tmp/{$uuid}.yml > /dev/null", "echo {$base64_compose} | base64 -d | tee /tmp/{$uuid}.yml > /dev/null",
@@ -848,6 +851,12 @@ function validateComposeFile(string $compose, int $server_id): string|Throwable
return 'OK'; return 'OK';
} catch (\Throwable $e) { } catch (\Throwable $e) {
return $e->getMessage(); return $e->getMessage();
} finally {
if (filled($server)) {
instant_remote_process([
"rm /tmp/{$uuid}.yml",
], $server, throwError: false);
}
} }
} }