starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-11-06 21:18:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge main into next (#12344)

Browse Source 
Co-authored-by: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Co-authored-by: Aditya Tripathi <aditya@climactic.co>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
github-actions[bot]
2026-10-27 20:25:53 +01:00
committed by GitHub
co-authored by Andras Bacsai Aditya Tripathi Claude Opus 5.5
parent e6df60c7a4
commit fe6c73726d
208 changed files with 4422 additions and 1085 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap/helpers/remoteProcess.php
+4 -4
View File
@@ -192,8 +192,8 @@ function instant_remote_process_with_timeout(Collection|array $command, Server $
return SshRetryHandler::retry(
function () use ($server, $command_string) {
$sshCommand = SshMultiplexingHelper::generateSshCommand($server, $command_string);
$process = runSshProcess($sshCommand, 30);
$sshCommand = SshMultiplexingHelper::generateSshBatchCommand($server);
$process = runSshProcess($sshCommand, 30, SshMultiplexingHelper::sshBatchInput($command_string));
$output = trim($process->output());
$exitCode = $process->exitCode();
@@ -228,8 +228,8 @@ function instant_remote_process(Collection|array $command, Server $server, bool
return SshRetryHandler::retry(
function () use ($server, $command_string, $effectiveTimeout, $disableMultiplexing) {
$sshCommand = SshMultiplexingHelper::generateSshCommand($server, $command_string, $disableMultiplexing, (int) $effectiveTimeout);
$process = runSshProcess($sshCommand, (int) $effectiveTimeout);
$sshCommand = SshMultiplexingHelper::generateSshBatchCommand($server, $disableMultiplexing, (int) $effectiveTimeout);
$process = runSshProcess($sshCommand, (int) $effectiveTimeout, SshMultiplexingHelper::sshBatchInput($command_string));
$output = trim($process->output());
$exitCode = $process->exitCode();