Merge branch 'patricio-wip-11' into patricio-wip-11-merger
# Conflicts: # app/Http/Livewire/DeployApplication.php # app/Jobs/ContainerStatusJob.php # bootstrap/helpers.php
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Jobs;
|
||||
|
||||
use App\Actions\RemoteProcess\RunRemoteProcess;
|
||||
use App\Data\RemoteProcessArgs;
|
||||
use App\Actions\CoolifyTask\RunRemoteProcess;
|
||||
use App\Data\CoolifyTaskArgs;
|
||||
use App\Enums\ActivityTypes;
|
||||
use App\Models\Application;
|
||||
use App\Models\InstanceSettings;
|
||||
@@ -55,14 +55,14 @@ class DeployApplicationJob implements ShouldQueue
|
||||
|
||||
$private_key_location = savePrivateKeyForServer($server);
|
||||
|
||||
$remoteProcessArgs = new RemoteProcessArgs(
|
||||
$remoteProcessArgs = new CoolifyTaskArgs(
|
||||
server_ip: $server->ip,
|
||||
private_key_location: $private_key_location,
|
||||
deployment_uuid: $this->deployment_uuid,
|
||||
command: 'overwritten-later',
|
||||
port: $server->port,
|
||||
user: $server->user,
|
||||
type: ActivityTypes::DEPLOYMENT->value,
|
||||
type_uuid: $this->deployment_uuid,
|
||||
);
|
||||
|
||||
$this->activity = activity()
|
||||
|
||||
Reference in New Issue
Block a user