diff --git a/app/Actions/CoolifyTask/RunRemoteProcess.php b/app/Actions/CoolifyTask/RunRemoteProcess.php index 979144b01..877e95170 100644 --- a/app/Actions/CoolifyTask/RunRemoteProcess.php +++ b/app/Actions/CoolifyTask/RunRemoteProcess.php @@ -36,7 +36,7 @@ class RunRemoteProcess public function __construct(Activity $activity, bool $hideFromOutput = false, bool $isFinished = false, bool $ignoreErrors = false) { - if ($activity->getExtraProperty('type') !== ActivityTypes::INSTANT->value && $activity->getExtraProperty('type') !== ActivityTypes::DEPLOYMENT->value) { + if ($activity->getExtraProperty('type') !== ActivityTypes::INLINE->value && $activity->getExtraProperty('type') !== ActivityTypes::DEPLOYMENT->value) { throw new \RuntimeException('Incompatible Activity to run a remote command.'); } diff --git a/app/Enums/ActivityTypes.php b/app/Enums/ActivityTypes.php index fac79267d..47fec9424 100644 --- a/app/Enums/ActivityTypes.php +++ b/app/Enums/ActivityTypes.php @@ -4,6 +4,6 @@ namespace App\Enums; enum ActivityTypes: string { - case INSTANT = 'instant'; + case INLINE = 'inline'; case DEPLOYMENT = 'deployment'; } diff --git a/app/Http/Livewire/ForceUpgrade.php b/app/Http/Livewire/ForceUpgrade.php index 706417014..bec3ee0f8 100644 --- a/app/Http/Livewire/ForceUpgrade.php +++ b/app/Http/Livewire/ForceUpgrade.php @@ -21,7 +21,7 @@ class ForceUpgrade extends Component ]); remoteProcess([ "sleep 10" - ], $server, ActivityTypes::INSTANT->value); + ], $server, ActivityTypes::INLINE->value); $this->emit('updateInitiated'); } else { $latestVersion = getLatestVersionOfCoolify(); @@ -44,7 +44,7 @@ class ForceUpgrade extends Component remoteProcess([ "bash /data/coolify/source/upgrade.sh $latestVersion" - ], $server, ActivityTypes::INSTANT->value); + ], $server, ActivityTypes::INLINE->value); $this->emit('updateInitiated'); } diff --git a/app/Http/Livewire/RunCommand.php b/app/Http/Livewire/RunCommand.php index 1e3f78f15..41002ca17 100755 --- a/app/Http/Livewire/RunCommand.php +++ b/app/Http/Livewire/RunCommand.php @@ -32,19 +32,19 @@ class RunCommand extends Component public function runCommand() { $this->isKeepAliveOn = true; - $this->activity = remoteProcess([$this->command], Server::where('uuid', $this->server)->first(), ActivityTypes::INSTANT->value); + $this->activity = remoteProcess([$this->command], Server::where('uuid', $this->server)->first(), ActivityTypes::INLINE->value); } public function runSleepingBeauty() { $this->isKeepAliveOn = true; - $this->activity = remoteProcess(['x=1; while [ $x -le 40 ]; do sleep 0.1 && echo "Welcome $x times" $(( x++ )); done'], Server::where('uuid', $this->server)->first(), ActivityTypes::INSTANT->value); + $this->activity = remoteProcess(['x=1; while [ $x -le 40 ]; do sleep 0.1 && echo "Welcome $x times" $(( x++ )); done'], Server::where('uuid', $this->server)->first(), ActivityTypes::INLINE->value); } public function runDummyProjectBuild() { $this->isKeepAliveOn = true; - $this->activity = remoteProcess([' cd projects/dummy-project', 'docker-compose build --no-cache'], Server::where('uuid', $this->server)->first(), ActivityTypes::INSTANT->value); + $this->activity = remoteProcess([' cd projects/dummy-project', 'docker-compose build --no-cache'], Server::where('uuid', $this->server)->first(), ActivityTypes::INLINE->value); } public function polling()