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

wip

Browse Source
This commit is contained in:
Andras Bacsai
2023-03-30 15:52:19 +02:00
parent 7f3e8bdad9
commit da2f657342
15 changed files with 245 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Actions/RemoteProcess/RunRemoteProcess.php
View File

@@ -70,22 +70,7 @@ class RunRemoteProcess
$port = $this->activity->getExtraProperty('port');
$command = $this->activity->getExtraProperty('command');
$delimiter = 'EOF-COOLIFY-SSH';
Storage::disk('local')->makeDirectory('.ssh');
$ssh_command = "ssh "
. "-i {$private_key_location} "
. '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
. '-o PasswordAuthentication=no '
. '-o RequestTTY=no '
. '-o LogLevel=ERROR '
. '-o ControlMaster=auto -o ControlPersist=1m -o ControlPath=/var/www/html/storage/app/.ssh/ssh_mux_%h_%p_%r '
. "-p {$port} "
. "{$user}@{$server_ip} "
. " 'bash -se' << \\$delimiter" . PHP_EOL
. $command . PHP_EOL
. $delimiter;
return $ssh_command;
return generateSshCommand($private_key_location, $server_ip, $user, $port, $command);
}
protected function handleOutput(string $type, string $output)

4
app/Http/Livewire/DeployApplication.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Livewire;
use App\Jobs\ContainerStatusJob;
use App\Models\Application;
use App\Models\CoolifyInstanceSettings;
use DateTimeImmutable;
@@ -220,7 +221,7 @@ class DeployApplication extends Component
$this->execute_in_builder("docker build -f {$workdir}/Dockerfile --build-arg SOURCE_COMMIT=$(cat {$workdir}/.git-commit) --progress plain -t {$this->application->uuid}:$(cat {$workdir}/.git-commit) {$workdir}");
$this->command[] = "echo 'Done.'";
$this->execute_in_builder("test ! -z \"$(docker ps --format '{{.State}}' --filter 'name={$this->application->uuid}')\" && docker rm -f {$this->application->uuid} >/dev/null 2>&1");
// $this->execute_in_builder("test ! -z \"$(docker ps --format '{{.State}}' --filter 'name={$this->application->uuid}')\" && docker rm -f {$this->application->uuid} >/dev/null 2>&1");
$this->command[] = "echo -n 'Deploying... '";
@@ -235,6 +236,7 @@ class DeployApplication extends Component
}
public function cancel()
{
ContainerStatusJob::dispatch();
}
public function render()
{

61
app/Jobs/ContainerStatusJob.php Normal file
View File

@@ -0,0 +1,61 @@
<?php
namespace App\Jobs;
use App\Actions\RemoteProcess\RunRemoteProcess;
use App\Models\Application;
use App\Models\Server;
use App\Traits\Docker;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Process;
use Tests\Support\Output;
class ContainerStatusJob implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public function __construct()
{
//
}
public function handle(): void
{
try {
$server = Server::all()->where('settings->is_build_server', '=', false)->first();
$applications = Application::all();
$not_found_applications = $applications;
$containers = [];
// foreach ($servers as $server) {
$private_key_location = savePrivateKey($server);
$ssh_command = generateSshCommand($private_key_location, $server->ip, $server->user, $server->port, 'docker ps -a -q --format \'{{json .}}\'');
$process = Process::run($ssh_command);
$output = trim($process->output());
$containers = formatDockerCmdOutputToJson($output);
foreach ($containers as $container) {
$found_application = $applications->filter(function ($value, $key) use ($container) {
return $value->uuid == $container['Names'];
})->first();
if ($found_application) {
$not_found_applications = $not_found_applications->filter(function ($value, $key) use ($found_application) {
return $value->uuid != $found_application->uuid;
});
$found_application->status = $container['State'];
$found_application->save();
Log::info('Found application: ' . $found_application->uuid . ' settings status to: ' . $found_application->status);
}
}
foreach ($not_found_applications as $not_found_application) {
$not_found_application->status = 'exited';
$not_found_application->save();
Log::info('Not found application: ' . $not_found_application->uuid . ' settings status to: ' . $not_found_application->status);
}
} catch (\Exception $e) {
Log::error($e->getMessage());
}
}
}

12
app/Models/Server.php
View File

@@ -4,8 +4,20 @@ namespace App\Models;
class Server extends BaseModel
{
protected static function booted()
{
static::created(function ($server) {
ServerSetting::create([
'server_id' => $server->id,
]);
});
}
public function privateKey()
{
return $this->belongsTo(PrivateKey::class);
}
public function settings()
{
return $this->hasOne(ServerSetting::class);
}
}

11
app/Models/ServerSetting.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
namespace App\Models;
class ServerSetting extends BaseModel
{
public function server()
{
return $this->belongsTo(Server::class);
}
}

77
bootstrap/helpers.php
View File

@@ -5,6 +5,8 @@ use App\Data\RemoteProcessArgs;
use App\Enums\ActivityTypes;
use App\Models\Server;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Spatie\Activitylog\Contracts\Activity;
@@ -24,9 +26,7 @@ if (!function_exists('remoteProcess')) {
// @TODO: Check if the user has access to this server
// checkTeam($server->team_id);
$temp_file = 'id.rsa_' . 'root' . '@' . $server->ip;
Storage::disk('local')->put($temp_file, $server->privateKey->private_key, 'private');
$private_key_location = '/var/www/html/storage/app/' . $temp_file;
$private_key_location = savePrivateKey($server);
return resolve(DispatchRemoteProcess::class, [
'remoteProcessArgs' => new RemoteProcessArgs(
@@ -43,11 +43,72 @@ if (!function_exists('remoteProcess')) {
),
])();
}
function checkTeam(string $team_id)
// function checkTeam(string $team_id)
// {
// $found_team = auth()->user()->teams->pluck('id')->contains($team_id);
// if (!$found_team) {
// throw new \RuntimeException('You do not have access to this server.');
// }
// }
}
if (!function_exists('savePrivateKey')) {
function savePrivateKey(Server $server)
{
$found_team = auth()->user()->teams->pluck('id')->contains($team_id);
if (!$found_team) {
throw new \RuntimeException('You do not have access to this server.');
}
$temp_file = 'id.rsa_' . 'root' . '@' . $server->ip;
Storage::disk('local')->put($temp_file, $server->privateKey->private_key, 'private');
return '/var/www/html/storage/app/' . $temp_file;
}
}
if (!function_exists('generateSshCommand')) {
function generateSshCommand(string $private_key_location, string $server_ip, string $user, string $port, $command)
{
$delimiter = 'EOF-COOLIFY-SSH';
Storage::disk('local')->makeDirectory('.ssh');
$ssh_command = "ssh "
. "-i {$private_key_location} "
. '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
. '-o PasswordAuthentication=no '
. '-o RequestTTY=no '
. '-o LogLevel=ERROR '
. '-o ControlMaster=auto -o ControlPersist=1m -o ControlPath=/var/www/html/storage/app/.ssh/ssh_mux_%h_%p_%r '
. "-p {$port} "
. "{$user}@{$server_ip} "
. " 'bash -se' << \\$delimiter" . PHP_EOL
. $command . PHP_EOL
. $delimiter;
return $ssh_command;
}
}
if (!function_exists('formatDockerCmdOutputToJson')) {
function formatDockerCmdOutputToJson($rawOutput): Collection
{
$outputLines = explode(PHP_EOL, $rawOutput);
return collect($outputLines)
->reject(fn ($line) => empty($line))
->map(fn ($outputLine) => json_decode($outputLine, true, flags: JSON_THROW_ON_ERROR));
}
}
if (!function_exists('formatDockerLabelsToJson')) {
function formatDockerLabelsToJson($rawOutput): Collection
{
$outputLines = explode(PHP_EOL, $rawOutput);
return collect($outputLines)
->reject(fn ($line) => empty($line))
->map(function ($outputLine) {
$outputArray = explode(',', $outputLine);
return collect($outputArray)
->map(function ($outputLine) {
return explode('=', $outputLine);
})
->mapWithKeys(function ($outputLine) {
return [$outputLine[0] => $outputLine[1]];
});
})[0];
}
}

72
composer.lock generated
View File

@@ -1193,16 +1193,16 @@
},
{
"name": "laravel/framework",
"version": "v10.4.1",
"version": "v10.5.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "7d15f7eef442633cff108f83d9fe43d8c3b8b76f"
"reference": "485f22333e8c1dff5bae0fe0421c1e2e139713de"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/7d15f7eef442633cff108f83d9fe43d8c3b8b76f",
"reference": "7d15f7eef442633cff108f83d9fe43d8c3b8b76f",
"url": "https://api.github.com/repos/laravel/framework/zipball/485f22333e8c1dff5bae0fe0421c1e2e139713de",
"reference": "485f22333e8c1dff5bae0fe0421c1e2e139713de",
"shasum": ""
},
"require": {
@@ -1389,7 +1389,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2023-03-18T11:34:02+00:00"
"time": "2023-03-29T15:09:16+00:00"
},
{
"name": "laravel/sanctum",
@@ -2683,16 +2683,16 @@
},
{
"name": "phpdocumentor/type-resolver",
"version": "1.7.0",
"version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5"
"reference": "dfc078e8af9c99210337325ff5aa152872c98714"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
"reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714",
"reference": "dfc078e8af9c99210337325ff5aa152872c98714",
"shasum": ""
},
"require": {
@@ -2735,9 +2735,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.0"
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1"
},
"time": "2023-03-12T10:13:29+00:00"
"time": "2023-03-27T19:02:04+00:00"
},
{
"name": "phpoption/phpoption",
@@ -3378,16 +3378,16 @@
},
{
"name": "psy/psysh",
"version": "v0.11.13",
"version": "v0.11.14",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "722317c9f5627e588788e340f29b923e58f92f54"
"reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/722317c9f5627e588788e340f29b923e58f92f54",
"reference": "722317c9f5627e588788e340f29b923e58f92f54",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/8c2e264def7a8263a68ef6f0b55ce90b77d41e17",
"reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17",
"shasum": ""
},
"require": {
@@ -3448,9 +3448,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.11.13"
"source": "https://github.com/bobthecow/psysh/tree/v0.11.14"
},
"time": "2023-03-21T14:22:44+00:00"
"time": "2023-03-28T03:41:01+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -7534,16 +7534,16 @@
},
{
"name": "laravel/sail",
"version": "v1.21.2",
"version": "v1.21.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
"reference": "19d6fe167e2389b41fe1b4ee52293d1eaf8a43fc"
"reference": "3042ff8cf403817c340d5a7762b2d32900239f46"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/19d6fe167e2389b41fe1b4ee52293d1eaf8a43fc",
"reference": "19d6fe167e2389b41fe1b4ee52293d1eaf8a43fc",
"url": "https://api.github.com/repos/laravel/sail/zipball/3042ff8cf403817c340d5a7762b2d32900239f46",
"reference": "3042ff8cf403817c340d5a7762b2d32900239f46",
"shasum": ""
},
"require": {
@@ -7595,7 +7595,7 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
"time": "2023-03-06T14:23:15+00:00"
"time": "2023-03-13T01:22:10+00:00"
},
{
"name": "mockery/mockery",
@@ -7889,16 +7889,16 @@
},
{
"name": "pestphp/pest",
"version": "v2.2.3",
"version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/pestphp/pest.git",
"reference": "6c8970e0a3b9bb36544bb1eacba0a4175dbafe97"
"reference": "5ae061d2080ea09608fe37fb05ebadcd183cef85"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pestphp/pest/zipball/6c8970e0a3b9bb36544bb1eacba0a4175dbafe97",
"reference": "6c8970e0a3b9bb36544bb1eacba0a4175dbafe97",
"url": "https://api.github.com/repos/pestphp/pest/zipball/5ae061d2080ea09608fe37fb05ebadcd183cef85",
"reference": "5ae061d2080ea09608fe37fb05ebadcd183cef85",
"shasum": ""
},
"require": {
@@ -7908,10 +7908,10 @@
"pestphp/pest-plugin": "^2.0.1",
"pestphp/pest-plugin-arch": "^2.0.2",
"php": "^8.1.0",
"phpunit/phpunit": "^10.0.18"
"phpunit/phpunit": "^10.0.19"
},
"conflict": {
"phpunit/phpunit": ">10.0.18",
"phpunit/phpunit": ">10.0.19",
"webmozart/assert": "<1.11.0"
},
"require-dev": {
@@ -7972,7 +7972,7 @@
],
"support": {
"issues": "https://github.com/pestphp/pest/issues",
"source": "https://github.com/pestphp/pest/tree/v2.2.3"
"source": "https://github.com/pestphp/pest/tree/v2.3.0"
},
"funding": [
{
@@ -7984,7 +7984,7 @@
"type": "github"
}
],
"time": "2023-03-24T11:26:54+00:00"
"time": "2023-03-28T09:16:29+00:00"
},
{
"name": "pestphp/pest-plugin",
@@ -8606,16 +8606,16 @@
},
{
"name": "phpunit/phpunit",
"version": "10.0.18",
"version": "10.0.19",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "582563ed2edc62d1455cdbe00ea49fe09428eef3"
"reference": "20c23e85c86e5c06d63538ba464e8054f4744e62"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/582563ed2edc62d1455cdbe00ea49fe09428eef3",
"reference": "582563ed2edc62d1455cdbe00ea49fe09428eef3",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20c23e85c86e5c06d63538ba464e8054f4744e62",
"reference": "20c23e85c86e5c06d63538ba464e8054f4744e62",
"shasum": ""
},
"require": {
@@ -8687,7 +8687,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.18"
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.19"
},
"funding": [
{
@@ -8703,7 +8703,7 @@
"type": "tidelift"
}
],
"time": "2023-03-22T06:15:31+00:00"
"time": "2023-03-27T11:46:33+00:00"
},
{
"name": "sebastian/cli-parser",

31
database/migrations/2023_03_24_140712_create_server_settings_table.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('server_settings', function (Blueprint $table) {
$table->id();
$table->string('uuid')->unique();
$table->boolean('is_build_server')->default(false);
$table->foreignId('server_id');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('server_settings');
}
};

4
database/seeders/ApplicationSeeder.php
View File

@@ -25,7 +25,7 @@ class ApplicationSeeder extends Seeder
$github_private_source = GithubApp::find(2);
Application::create([
'id' => 1,
'name' => 'My first application',
'name' => 'Public application (from GitHub)',
'git_repository' => 'coollabsio/coolify-examples',
'git_branch' => 'nodejs-fastify',
'build_pack' => 'nixpacks',
@@ -39,7 +39,7 @@ class ApplicationSeeder extends Seeder
]);
Application::create([
'id' => 2,
'name' => 'My second application',
'name' => 'Private application (through GitHub App)',
'git_repository' => 'coollabsio/nodejs-example',
'git_branch' => 'main',
'build_pack' => 'nixpacks',

14
database/seeders/DBSeeder.php
View File

@@ -13,12 +13,12 @@ class DBSeeder extends Seeder
{
$environment_1 = Environment::find(1);
$standalone_docker_1 = StandaloneDocker::find(1);
Database::create([
'id' => 1,
'name'=> "My first database",
'environment_id' => $environment_1->id,
'destination_id' => $standalone_docker_1->id,
'destination_type' => StandaloneDocker::class,
]);
// Database::create([
// 'id' => 1,
// 'name'=> "My first database",
// 'environment_id' => $environment_1->id,
// 'destination_id' => $standalone_docker_1->id,
// 'destination_type' => StandaloneDocker::class,
// ]);
}
}

14
database/seeders/ServiceSeeder.php
View File

@@ -16,12 +16,12 @@ class ServiceSeeder extends Seeder
{
$environment_1 = Environment::find(1);
$standalone_docker_1 = StandaloneDocker::find(1);
Service::create([
'id' => 1,
'name'=> "My first service",
'environment_id' => $environment_1->id,
'destination_id' => $standalone_docker_1->id,
'destination_type' => StandaloneDocker::class,
]);
// Service::create([
// 'id' => 1,
// 'name'=> "My first service",
// 'environment_id' => $environment_1->id,
// 'destination_id' => $standalone_docker_1->id,
// 'destination_type' => StandaloneDocker::class,
// ]);
}
}

9
resources/views/livewire/demo-deploy-application.blade.php
View File

@@ -1,9 +0,0 @@
<div>
@isset($activity?->id)
<div>
Activity: <span>{{ $activity?->id ?? 'waiting' }}</span>
</div>
<pre style="width: 100%;overflow-y: scroll;" @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif>{{ data_get($activity, 'description') }}</pre>
@endisset
<button wire:click='deploy'>Deploy</button>
</div>

5
resources/views/project/application.blade.php
View File

@@ -1,7 +1,8 @@
<x-layout>
<h1>Application</h1>
<p>Name: {{ $project->name }}</p>
<p>UUID: {{ $project->uuid }}</p>
<p>Name: {{ $application->name }}</p>
<p>Application UUID: {{ $application->uuid }}</p>
<p>Status: {{ $application->status }}</p>
<livewire:deploy-application :application_uuid="$application->uuid" />
<div>
<h1>Deployments</h1>

4
tests/Feature/DockerCommandsTest.php
View File

@@ -15,7 +15,7 @@ it('starts a docker container correctly', function () {
// Assert there's no containers start with coolify_test_*
$activity = remoteProcess([$areThereCoolifyTestContainers], $host);
$containers = Output::containerList($activity->getExtraProperty('stdout'));
$containers = formatDockerCmdOutputToJson($activity->getExtraProperty('stdout'));
expect($containers)->toBeEmpty();
// start a container nginx -d --name = $containerName
@@ -24,7 +24,7 @@ it('starts a docker container correctly', function () {
// docker ps name = $container
$activity = remoteProcess([$areThereCoolifyTestContainers], $host);
$containers = Output::containerList($activity->getExtraProperty('stdout'));
$containers = formatDockerCmdOutputToJson($activity->getExtraProperty('stdout'));
expect($containers->where('Names', $containerName)->count())->toBe(1);
// Stop testing containers

17
tests/Support/Output.php
View File

@@ -1,17 +0,0 @@
<?php
namespace Tests\Support;
use Illuminate\Support\Collection;
class Output
{
public static function containerList($rawOutput): Collection
{
$outputLines = explode(PHP_EOL, $rawOutput);
return collect($outputLines)
->reject(fn($line) => empty($line))
->map(fn($outputLine) => json_decode($outputLine, flags: JSON_THROW_ON_ERROR));
}
}