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

Merge branch 'patricio-wip-11' into patricio-wip-11-merger

Browse Source 
# Conflicts:
#	app/Http/Livewire/DeployApplication.php
#	app/Jobs/ContainerStatusJob.php
#	bootstrap/helpers.php
This commit is contained in:
Joao Patricio
2023-05-03 06:29:05 +01:00
parent f723b504a1 e7763f3b73
commit 85af1b4ffb
16 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bootstrap/helpers.php
View File

@@ -1,8 +1,7 @@
<?php
use App\Actions\RemoteProcess\DispatchRemoteProcess;
use App\Data\RemoteProcessArgs;
use App\Enums\ActivityTypes;
use App\Actions\CoolifyTask\PrepareCoolifyTask;
use App\Data\CoolifyTaskArgs;
use App\Models\Server;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
@@ -19,10 +18,10 @@ if (!function_exists('remoteProcess')) {
*
*/
function remoteProcess(
array $command,
Server $server,
?string $deployment_uuid = null,
?Model $model = null,
array $command,
Server $server,
?string $type_uuid = null,
?Model $model = null,
): Activity {
$command_string = implode("\n", $command);
@@ -32,17 +31,17 @@ if (!function_exists('remoteProcess')) {
$private_key_location = savePrivateKeyForServer($server);
return resolve(DispatchRemoteProcess::class, [
'remoteProcessArgs' => new RemoteProcessArgs(
return resolve(PrepareCoolifyTask::class, [
'remoteProcessArgs' => new CoolifyTaskArgs(
server_ip: $server->ip,
private_key_location: $private_key_location,
deployment_uuid: $deployment_uuid,
command: <<<EOT
{$command_string}
EOT,
port: $server->port,
user: $server->user,
type: $deployment_uuid ? ActivityTypes::DEPLOYMENT->value : ActivityTypes::REMOTE_PROCESS->value,
type: $type_uuid,
type_uuid: $type_uuid,
model: $model,
),
])();
@@ -119,8 +118,8 @@ if (!function_exists('formatDockerLabelsToJson')) {
})[0];
}
}
if (!function_exists('runRemoteCommandSync')) {
function runRemoteCommandSync(Server $server, array $command, $throwError = true)
if (!function_exists('instantRemoteProcess')) {
function instantRemoteProcess(Server $server, array $command, $throwError = true)
{
$command_string = implode("\n", $command);
$private_key_location = savePrivateKeyForServer($server);