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

fix: ssh-agent revert

Browse Source
This commit is contained in:
Andras Bacsai
2023-09-15 12:30:25 +02:00
parent cf28490acc
commit 54a57d217f
13 changed files with 37 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/CoolifyTask/RunRemoteProcess.php
View File

@@ -73,7 +73,7 @@ class RunRemoteProcess
$this->time_start = hrtime(true);
$status = ProcessStatus::IN_PROGRESS;
$processResult = processWithEnv()->forever()->run($this->getCommand(), $this->handleOutput(...));
$processResult = Process::forever()->run($this->getCommand(), $this->handleOutput(...));
if ($this->activity->properties->get('status') === ProcessStatus::ERROR->value) {
$status = ProcessStatus::ERROR;

2
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -652,7 +652,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
private function generate_healthcheck_commands()
{
if ($this->application->dockerfile) {
if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile') {
// TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
return 'exit 0';
}

2
app/Traits/ExecuteRemoteCommand.php
View File

@@ -39,7 +39,7 @@ trait ExecuteRemoteCommand
$this->save = data_get($single_command, 'save');
$remote_command = generateSshCommand( $ip, $user, $port, $command);
$process = processWithEnv()->timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden) {
$process = Process::timeout(3600)->idleTimeout(3600)->start($remote_command, function (string $type, string $output) use ($command, $hidden) {
$output = Str::of($output)->trim();
$new_log_entry = [
'command' => $command,