mirror of
https://github.com/tiennm99/coolify.git
synced 2026-10-13 08:15:24 +00:00
Refactor application general settings view for improved readability and maintainability
- Adjusted indentation and formatting for better code clarity. - Simplified conditional statements and removed unnecessary null checks. - Enhanced user interface elements for Docker Compose and Dockerfile configurations. - Improved handling of deployment commands and network settings. - Updated helper texts for better user guidance.
This commit is contained in:
1 parent
3ffe05f0ce
commit
770ce2d327
3 files changed
+324
-294
No files matched your search
@@ -1584,6 +1584,11 @@ class Application extends BaseModel
|
||||
try {
|
||||
$composeFileContent = instant_remote_process($commands, $this->destination->server);
|
||||
} catch (\Exception $e) {
|
||||
// Restore original values on failure only
|
||||
$this->docker_compose_location = $initialDockerComposeLocation;
|
||||
$this->base_directory = $initialBaseDirectory;
|
||||
$this->save();
|
||||
|
||||
if (str($e->getMessage())->contains('No such file')) {
|
||||
throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
|
||||
}
|
||||
@@ -1595,9 +1600,7 @@ class Application extends BaseModel
|
||||
}
|
||||
throw new \RuntimeException($e->getMessage());
|
||||
} finally {
|
||||
$this->docker_compose_location = $initialDockerComposeLocation;
|
||||
$this->base_directory = $initialBaseDirectory;
|
||||
$this->save();
|
||||
// Cleanup only - restoration happens in catch block
|
||||
$commands = collect([
|
||||
"rm -rf /tmp/{$uuid}",
|
||||
]);
|
||||
@@ -1643,6 +1646,11 @@ class Application extends BaseModel
|
||||
'initialDockerComposeLocation' => $this->docker_compose_location,
|
||||
];
|
||||
} else {
|
||||
// Restore original values before throwing
|
||||
$this->docker_compose_location = $initialDockerComposeLocation;
|
||||
$this->base_directory = $initialBaseDirectory;
|
||||
$this->save();
|
||||
|
||||
throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user