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

wip: services

Browse Source
This commit is contained in:
Andras Bacsai
2023-09-20 15:42:41 +02:00
parent a86e971020
commit b4d69a22df
32 changed files with 964 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Livewire/Project/Application/General.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Livewire\Project\Application;
use App\Models\Application;
use App\Models\InstanceSettings;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
use Livewire\Component;
use Spatie\Url\Url;
@@ -14,7 +15,7 @@ class General extends Component
public string $applicationId;
public Application $application;
public ?array $services = null;
public Collection $services;
public string $name;
public string|null $fqdn;
public string $git_repository;
@@ -33,6 +34,7 @@ class General extends Component
public bool $is_auto_deploy_enabled;
public bool $is_force_https_enabled;
public array $service_configurations = [];
protected $rules = [
'application.name' => 'required',
@@ -54,6 +56,8 @@ class General extends Component
'application.dockercompose_raw' => 'nullable',
'application.dockercompose' => 'nullable',
'application.service_configurations.*' => 'nullable',
'service_configurations.*.fqdn' => 'nullable|url',
'service_configurations.*.port' => 'integer',
];
protected $validationAttributes = [
'application.name' => 'name',
@@ -74,6 +78,8 @@ class General extends Component
'application.dockerfile' => 'Dockerfile',
'application.dockercompose_raw' => 'Docker Compose (raw)',
'application.dockercompose' => 'Docker Compose',
'service_configurations.*.fqdn' => 'FQDN',
'service_configurations.*.port' => 'Port',
];
@@ -95,8 +101,8 @@ class General extends Component
$this->application->settings->save();
$this->application->save();
$this->application->refresh();
$this->emit('success', 'Application settings updated!');
$this->checkWildCardDomain();
$this->emit('success', 'Application settings updated!');
}
protected function checkWildCardDomain()
@@ -109,6 +115,7 @@ class General extends Component
public function mount()
{
$this->services = $this->application->services();
$this->is_static = $this->application->settings->is_static;
$this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
$this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
@@ -117,8 +124,8 @@ class General extends Component
$this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
$this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
$this->checkWildCardDomain();
if (data_get($this->application, 'dockercompose_raw')) {
$this->services = data_get(Yaml::parse($this->application->dockercompose_raw), 'services');
if (data_get($this->application, 'service_configurations')) {
$this->service_configurations = $this->application->service_configurations;
}
}
@@ -149,8 +156,8 @@ class General extends Component
public function submit()
{
try {
ray($this->application->service_configurations);
// $this->validate();
$this->application->service_configurations = $this->service_configurations;
$this->validate();
if (data_get($this->application, 'fqdn')) {
$domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
return Str::of($domain)->trim()->lower();
@@ -170,7 +177,7 @@ class General extends Component
$this->application->publish_directory = rtrim($this->application->publish_directory, '/');
}
if (data_get($this->application, 'dockercompose_raw')) {
$details = generateServiceFromTemplate($this->application->dockercompose_raw, $this->application);
$details = generateServiceFromTemplate( $this->application);
$this->application->dockercompose = data_get($details, 'dockercompose');
}
$this->application->save();

2
app/Http/Livewire/Project/Application/Heading.php
View File

@@ -64,7 +64,7 @@ class Heading extends Component
foreach ($containers as $container) {
$containerName = data_get($container, 'Names');
if ($containerName) {
remote_process(
instant_remote_process(
["docker rm -f {$containerName}"],
$this->application->destination->server
);

135
app/Http/Livewire/Project/New/DockerCompose.php
View File

@@ -7,11 +7,15 @@ use App\Models\EnvironmentVariable;
use App\Models\GithubApp;
use App\Models\LocalPersistentVolume;
use App\Models\Project;
use App\Models\Service;
use App\Models\ServiceApplication;
use App\Models\ServiceDatabase;
use App\Models\StandaloneDocker;
use App\Models\SwarmDocker;
use Livewire\Component;
use Visus\Cuid2\Cuid2;
use Illuminate\Support\Str;
use Symfony\Component\Yaml\Yaml;
class DockerCompose extends Component
{
@@ -70,68 +74,81 @@ class DockerCompose extends Component
$project = Project::where('uuid', $this->parameters['project_uuid'])->first();
$environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
$application = Application::create([
'name' => 'dockercompose-' . new Cuid2(7),
'repository_project_id' => 0,
'fqdn' => 'https://app.coolify.io',
'git_repository' => "coollabsio/coolify",
'git_branch' => 'main',
'build_pack' => 'dockercompose',
'ports_exposes' => '0',
'dockercompose_raw' => $this->dockercompose,
'environment_id' => $environment->id,
'destination_id' => $destination->id,
'destination_type' => $destination_class,
'source_id' => 0,
'source_type' => GithubApp::class
]);
$fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io";
if (isDev()) {
$fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
}
$application->update([
'name' => 'dockercompose-' . $application->uuid,
'fqdn' => $fqdn,
]);
$service = new Service();
$service->uuid = (string) new Cuid2(7);
$service->name = 'service-' . new Cuid2(7);
$service->docker_compose_raw = $this->dockercompose;
$service->environment_id = $environment->id;
$service->destination_id = $destination->id;
$service->destination_type = $destination_class;
$service->save();
$service->parse(saveIt: true);
$details = generateServiceFromTemplate($this->dockercompose, $application);
$envs = data_get($details, 'envs', []);
if ($envs->count() > 0) {
foreach ($envs as $env) {
$key = Str::of($env)->before('=');
$value = Str::of($env)->after('=');
EnvironmentVariable::create([
'key' => $key,
'value' => $value,
'is_build_time' => false,
'application_id' => $application->id,
'is_preview' => false,
]);
}
}
$volumes = data_get($details, 'volumes', []);
if ($volumes->count() > 0) {
foreach ($volumes as $volume => $mount_path) {
LocalPersistentVolume::create([
'name' => $volume,
'mount_path' => $mount_path,
'resource_id' => $application->id,
'resource_type' => $application->getMorphClass(),
'is_readonly' => false
]);
}
}
$dockercompose_coolified = data_get($details, 'dockercompose', '');
$application->update([
'dockercompose' => $dockercompose_coolified,
'ports_exposes' => data_get($details, 'ports', 0)->implode(','),
]);
redirect()->route('project.application.configuration', [
'application_uuid' => $application->uuid,
return redirect()->route('project.service', [
'service_uuid' => $service->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
// $compose = data_get($parsedService, 'docker_compose');
// $service->docker_compose = $compose;
// $shouldDefine = data_get($parsedService, 'should_define', collect([]));
// if ($shouldDefine->count() > 0) {
// $envs = data_get($shouldDefine, 'envs', []);
// foreach($envs as $env) {
// ray($env);
// $variableName = Str::of($env)->before('=');
// $variableValue = Str::of($env)->after('=');
// ray($variableName, $variableValue);
// }
// }
// foreach ($services as $serviceName => $serviceDetails) {
// if (data_get($serviceDetails,'is_database')) {
// $serviceDatabase = new ServiceDatabase();
// $serviceDatabase->name = $serviceName . '-' . $service->uuid;
// $serviceDatabase->service_id = $service->id;
// $serviceDatabase->save();
// } else {
// $serviceApplication = new ServiceApplication();
// $serviceApplication->name = $serviceName . '-' . $service->uuid;
// $serviceApplication->fqdn =
// $serviceApplication->service_id = $service->id;
// $serviceApplication->save();
// }
// }
// ray($details);
// $envs = data_get($details, 'envs', []);
// if ($envs->count() > 0) {
// foreach ($envs as $env) {
// $key = Str::of($env)->before('=');
// $value = Str::of($env)->after('=');
// EnvironmentVariable::create([
// 'key' => $key,
// 'value' => $value,
// 'is_build_time' => false,
// 'service_id' => $service->id,
// 'is_preview' => false,
// ]);
// }
// }
// $volumes = data_get($details, 'volumes', []);
// if ($volumes->count() > 0) {
// foreach ($volumes as $volume => $mount_path) {
// LocalPersistentVolume::create([
// 'name' => $volume,
// 'mount_path' => $mount_path,
// 'resource_id' => $service->id,
// 'resource_type' => $service->getMorphClass(),
// 'is_readonly' => false
// ]);
// }
// }
// $dockercompose_coolified = data_get($details, 'dockercompose', '');
// $service->update([
// 'docker_compose' => $dockercompose_coolified,
// ]);
}
}

24
app/Http/Livewire/Project/Service/Index.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
namespace App\Http\Livewire\Project\Service;
use App\Models\Service;
use Livewire\Component;
class Index extends Component
{
public Service $service;
public array $parameters;
public array $query;
public function mount() {
$this->parameters = get_route_parameters();
$this->query = request()->query();
$this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
}
public function render()
{
return view('livewire.project.service.index')->layout('layouts.app');
}
}

25
app/Http/Livewire/Service/Index.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
namespace App\Http\Livewire\Service;
use App\Models\Service;
use Livewire\Component;
class Index extends Component
{
public Service $service;
public array $parameters;
public array $query;
public function mount() {
$this->parameters = get_route_parameters();
$this->query = request()->query();
$this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
ray($this->service->docker_compose);
}
public function render()
{
return view('livewire.project.service.index')->layout('layouts.app');
}
}

28
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -73,6 +73,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
$this->log_model = $this->application_deployment_queue;
$this->application = Application::find($this->application_deployment_queue->application_id);
$isService = $this->application->services()->count() > 0;
$this->application_deployment_queue_id = $application_deployment_queue_id;
$this->deployment_uuid = $this->application_deployment_queue->deployment_uuid;
$this->pull_request_id = $this->application_deployment_queue->pull_request_id;
@@ -128,7 +129,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
try {
if ($this->application->dockerfile) {
$this->deploy_simple_dockerfile();
} else if($this->application->dockercompose) {
} else if ($this->application->services()->count() > 0) {
$this->deploy_docker_compose();
} else {
if ($this->pull_request_id !== 0) {
@@ -168,7 +169,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
);
}
}
private function deploy_docker_compose() {
private function deploy_docker_compose()
{
$dockercompose_base64 = base64_encode($this->application->dockercompose);
$this->execute_remote_command(
[
@@ -184,9 +186,26 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
$this->build_image_name = Str::lower("{$this->application->git_repository}:build");
$this->production_image_name = Str::lower("{$this->application->uuid}:latest");
$this->save_environment_variables();
$this->start_by_compose_file();
$containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
if ($containers->count() > 0) {
foreach ($containers as $container) {
$containerName = data_get($container, 'Names');
if ($containerName) {
instant_remote_process(
["docker rm -f {$containerName}"],
$this->application->destination->server
);
}
}
}
$this->execute_remote_command(
["echo -n 'Starting services (could take a while)...'"],
[executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
);
}
private function save_environment_variables() {
private function save_environment_variables()
{
$envs = collect([]);
foreach ($this->application->environment_variables as $env) {
$envs->push($env->key . '=' . $env->value);
@@ -197,7 +216,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d > $this->workdir/.env")
],
);
}
private function deploy_simple_dockerfile()
{

7
app/Models/Application.php
View File

@@ -4,12 +4,17 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Collection;
use Spatie\Activitylog\Models\Activity;
use Symfony\Component\Yaml\Yaml;
use Illuminate\Support\Str;
class Application extends BaseModel
{
protected $guarded = [];
protected $casts = [
'service_configurations' => 'array',
];
protected static function booted()
{
static::created(function ($application) {

14
app/Models/EnvironmentVariable.php
View File

@@ -33,12 +33,14 @@ class EnvironmentVariable extends Model
}
});
}
public function service() {
return $this->belongsTo(Service::class);
}
protected function value(): Attribute
{
return Attribute::make(
get: fn (string $value) => $this->get_environment_variables($value),
set: fn (string $value) => $this->set_environment_variables($value),
get: fn (?string $value = null) => $this->get_environment_variables($value),
set: fn (?string $value = null) => $this->set_environment_variables($value),
);
}
@@ -57,8 +59,11 @@ class EnvironmentVariable extends Model
return $environment_variable;
}
private function set_environment_variables(string $environment_variable): string|null
private function set_environment_variables(?string $environment_variable = null): string|null
{
if (is_null($environment_variable) && $environment_variable == '') {
return null;
}
$environment_variable = trim($environment_variable);
return encrypt($environment_variable);
}
@@ -69,4 +74,5 @@ class EnvironmentVariable extends Model
set: fn (string $value) => Str::of($value)->trim(),
);
}
}

4
app/Models/LocalPersistentVolume.php
View File

@@ -14,6 +14,10 @@ class LocalPersistentVolume extends Model
{
return $this->morphTo();
}
public function service()
{
return $this->morphTo();
}
public function standalone_postgresql()
{

3
app/Models/Server.php
View File

@@ -76,6 +76,9 @@ class Server extends BaseModel
return $this->hasOne(ServerSetting::class);
}
public function proxyType() {
return $this->proxy->get('type');
}
public function scopeWithProxy(): Builder
{
return $this->proxy->modelScope();

267
app/Models/Service.php Normal file
View File

@@ -0,0 +1,267 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Collection;
use Symfony\Component\Yaml\Yaml;
use Illuminate\Support\Str;
class Service extends BaseModel
{
use HasFactory;
protected $guarded = [];
public function destination()
{
return $this->morphTo();
}
public function persistentStorages()
{
return $this->morphMany(LocalPersistentVolume::class, 'resource');
}
public function portsMappingsArray(): Attribute
{
return Attribute::make(
get: fn () => is_null($this->ports_mappings)
? []
: explode(',', $this->ports_mappings),
);
}
public function portsExposesArray(): Attribute
{
return Attribute::make(
get: fn () => is_null($this->ports_exposes)
? []
: explode(',', $this->ports_exposes)
);
}
public function applications()
{
return $this->hasMany(ServiceApplication::class);
}
public function databases()
{
return $this->hasMany(ServiceDatabase::class);
}
public function environment_variables(): HasMany
{
return $this->hasMany(EnvironmentVariable::class)->orderBy('key', 'asc');
}
public function parse(bool $saveIt = false): Collection
{
if ($this->docker_compose_raw) {
ray()->clearAll();
$yaml = Yaml::parse($this->docker_compose_raw);
$composeVolumes = collect(data_get($yaml, 'volumes', []));
$composeNetworks = collect(data_get($yaml, 'networks', []));
$services = data_get($yaml, 'services');
$definedNetwork = data_get($this, 'destination.network');
$volumes = collect([]);
$envs = collect([]);
$ports = collect([]);
$services = collect($services)->map(function ($service, $serviceName) use ($composeVolumes, $composeNetworks, $definedNetwork, $envs, $volumes, $ports, $saveIt) {
$isDatabase = false;
// Decide if the service is a database
$image = data_get($service, 'image');
if ($image) {
$imageName = Str::of($image)->before(':');
if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
$isDatabase = true;
data_set($service, 'is_database', true);
}
}
if ($saveIt) {
if ($isDatabase) {
$savedService = ServiceDatabase::create([
'name' => $serviceName,
'service_id' => $this->id
]);
} else {
$savedService = ServiceApplication::create([
'name' => $serviceName,
'service_id' => $this->id
]);
}
}
// Collect ports
$servicePorts = collect(data_get($service, 'ports', []));
$ports->put($serviceName, $servicePorts);
if ($saveIt) {
$savedService->ports_exposes = $servicePorts->implode(',');
$savedService->save();
}
// Collect volumes
$serviceVolumes = collect(data_get($service, 'volumes', []));
if ($serviceVolumes->count() > 0) {
foreach ($serviceVolumes as $volume) {
if (is_string($volume)) {
$volumeName = Str::before($volume, ':');
$volumePath = Str::after($volume, ':');
}
if (is_array($volume)) {
$volumeName = data_get($volume, 'source');
$volumePath = data_get($volume, 'target');
}
$volumeExists = $serviceVolumes->contains(function ($_, $key) use ($volumeName) {
return $key == $volumeName;
});
if (!$volumeExists) {
if (!Str::startsWith($volumeName, '/')) {
$composeVolumes->put($volumeName, null);
}
$volumes->put($volumeName, $volumePath);
if ($saveIt) {
LocalPersistentVolume::create([
'name' => $volumeName,
'mount_path' => $volumePath,
'resource_id' => $savedService->id,
'resource_type' => get_class($savedService)
]);
}
}
}
}
// Collect and add networks
$serviceNetworks = collect(data_get($service, 'networks', []));
if ($serviceNetworks->count() > 0) {
foreach ($serviceNetworks as $networkName => $networkDetails) {
$networkExists = $composeNetworks->contains(function ($value, $key) use ($networkName) {
return $value == $networkName || $key == $networkName;
});
if (!$networkExists) {
$composeNetworks->put($networkName, null);
}
}
}
// Add Coolify specific networks
$definedNetworkExists = $composeNetworks->contains(function ($value, $_) use ($definedNetwork) {
return $value == $definedNetwork;
});
if (!$definedNetworkExists) {
$composeNetworks->put($definedNetwork, [
'external' => true
]);
}
// Get variables from the service that does not start with SERVICE_*
$serviceVariables = collect(data_get($service, 'environment', []));
foreach ($serviceVariables as $variable) {
$value = Str::after($variable, '=');
if (!Str::startsWith($value, '$SERVICE_') && !Str::startsWith($value, '${SERVICE_') && Str::startsWith($value, '$')) {
$value = Str::of(replaceVariables(Str::of($value)));
if ($value->contains(':')) {
$nakedName = $value->before(':');
$nakedValue = $value->after(':');
} else if ($value->contains('-')) {
$nakedName = $value->before('-');
$nakedValue = $value->after('-');
} else if ($value->contains('+')) {
$nakedName = $value->before('+');
$nakedValue = $value->after('+');
} else {
$nakedName = $value;
}
if (isset($nakedName)) {
if (isset($nakedValue)) {
if ($nakedValue->startsWith('-')) {
$nakedValue = Str::of($nakedValue)->after('-');
}
if ($nakedValue->startsWith('+')) {
$nakedValue = Str::of($nakedValue)->after('+');
}
if (!$envs->has($nakedName->value())) {
$envs->put($nakedName->value(), $nakedValue->value());
if ($saveIt) {
EnvironmentVariable::create([
'key' => $nakedName->value(),
'value' => $nakedValue->value(),
'is_build_time' => false,
'service_id' => $this->id,
'is_preview' => false,
]);
}
}
} else {
if (!$envs->has($nakedName->value())) {
$envs->put($nakedName->value(), null);
if ($saveIt) {
EnvironmentVariable::create([
'key' => $nakedName->value(),
'value' => null,
'is_build_time' => false,
'service_id' => $this->id,
'is_preview' => false,
]);
}
}
}
}
} else {
$value = Str::of(replaceVariables(Str::of($value)));
$generatedValue = null;
if ($value->startsWith('SERVICE_USER')) {
$generatedValue = Str::random(10);
if ($saveIt) {
if (!$envs->has($value->value())) {
$envs->put($value->value(), $generatedValue);
EnvironmentVariable::create([
'key' => $value->value(),
'value' => $generatedValue,
'is_build_time' => false,
'service_id' => $this->id,
'is_preview' => false,
]);
}
}
} else if ($value->startsWith('SERVICE_PASSWORD')) {
$generatedValue = Str::password(symbols: false);
if ($saveIt) {
if (!$envs->has($value->value())) {
$envs->put($value->value(), $generatedValue);
EnvironmentVariable::create([
'key' => $value->value(),
'value' => $generatedValue,
'is_build_time' => false,
'service_id' => $this->id,
'is_preview' => false,
]);
}
}
}
}
}
data_forget($service, 'is_database');
data_forget($service, 'documentation');
return $service;
});
data_set($services, 'volumes', $composeVolumes->toArray());
data_set($services, 'networks', $composeNetworks->toArray());
$this->docker_compose = Yaml::parse($services);
// $compose = Str::of(Yaml::dump($services, 10, 2));
// TODO: Replace SERVICE_FQDN_* with the actual FQDN
// TODO: Replace SERVICE_URL_*
$shouldBeDefined = collect([
'envs' => $envs,
'volumes' => $volumes,
'ports' => $ports
]);
$parsedCompose = collect([
'dockerCompose' => $services,
'shouldBeDefined' => $shouldBeDefined
]);
return $parsedCompose;
} else {
return collect([]);
}
}
}

12
app/Models/ServiceApplication.php Normal file
View File

@@ -0,0 +1,12 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class ServiceApplication extends BaseModel
{
use HasFactory;
protected $guarded = [];
}

12
app/Models/ServiceDatabase.php Normal file
View File

@@ -0,0 +1,12 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class ServiceDatabase extends BaseModel
{
use HasFactory;
protected $guarded = [];
}

5
app/Models/StandaloneDocker.php
View File

@@ -21,6 +21,11 @@ class StandaloneDocker extends BaseModel
return $this->belongsTo(Server::class);
}
public function service()
{
return $this->belongsTo(Service::class, 'destination');
}
public function attachedTo()
{
return $this->applications?->count() > 0 || $this->databases?->count() > 0;

2
app/View/Components/Forms/Textarea.php
View File

@@ -25,7 +25,7 @@ class Textarea extends Component
public bool $readonly = false,
public string|null $helper = null,
public bool $realtimeValidation = false,
public string $defaultClass = "textarea bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
public string $defaultClass = "textarea leading-normal bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
) {
//
}