Skip to content

Commit

Permalink
feat: services
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrasbacsai
andrasbacsai committed Sep 25, 2023
1 parent 58522b5 commit 0b11093
Show file tree
Hide file tree
Showing 27 changed files with 314 additions and 87 deletions.
4 changes: 2 additions & 2 deletions app/Actions/Service/StartService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public function handle(Service $service)
$commands[] = "cd " . $service->workdir();
$commands[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
$commands[] = "echo '####### Pulling images.'";
$commands[] = "docker compose pull --quiet";
$commands[] = "docker compose pull";
$commands[] = "echo '####### Starting containers.'";
$commands[] = "docker compose up -d >/dev/null 2>&1";
$commands[] = "docker compose up -d";
$commands[] = "docker network connect $service->uuid coolify-proxy 2>/dev/null || true";
$activity = remote_process($commands, $service->server);
return $activity;
Expand Down
30 changes: 27 additions & 3 deletions app/Http/Controllers/ProjectController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

use App\Models\Project;
use App\Models\Server;
use App\Models\Service;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Str;

class ProjectController extends Controller
{
Expand Down Expand Up @@ -41,9 +44,10 @@ public function show()

public function new()
{
$type = request()->query('type');
$services = Cache::get('services', []);
$type = Str::of(request()->query('type'));
$destination_uuid = request()->query('destination');
$server = requesT()->query('server');
$server_id = request()->query('server');

$project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
if (!$project) {
Expand All @@ -61,8 +65,28 @@ public function new()
'database_uuid' => $standalone_postgresql->uuid,
]);
}
if ($type->startsWith('one-click-service-')) {
$oneClickServiceName = $type->after('one-click-service-')->value();
$oneClickService = data_get($services, $oneClickServiceName);
if ($oneClickService) {
$service = Service::create([
'name' => "$oneClickServiceName-" . Str::random(10),
'docker_compose_raw' => base64_decode($oneClickService),
'environment_id' => $environment->id,
'server_id' => (int) $server_id,
]);

$service->parse(isNew: true);

return redirect()->route('project.service', [
'service_uuid' => $service->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
}
}
return view('project.new', [
'type' => $type
'type' => $type->value()
]);
}

Expand Down
11 changes: 6 additions & 5 deletions app/Http/Livewire/Project/New/DockerCompose.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@

class DockerCompose extends Component
{
public string $dockercompose = '';
public string $dockerComposeRaw = '';
public array $parameters;
public array $query;
public function mount()
{

$this->parameters = get_route_parameters();
$this->query = request()->query();
if (isDev()) {
$this->dockercompose = 'services:
$this->dockerComposeRaw = 'services:
plausible_events_db:
image: clickhouse/clickhouse-server:23.3.7.5-alpine
restart: always
Expand All @@ -37,17 +38,17 @@ public function submit()
{
try {
$this->validate([
'dockercompose' => 'required'
'dockerComposeRaw' => 'required'
]);
$this->dockercompose = Yaml::dump(Yaml::parse($this->dockercompose), 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
$this->dockerComposeRaw = Yaml::dump(Yaml::parse($this->dockerComposeRaw), 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
$server_id = $this->query['server_id'];

$project = Project::where('uuid', $this->parameters['project_uuid'])->first();
$environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();

$service = Service::create([
'name' => 'service' . Str::random(10),
'docker_compose_raw' => $this->dockercompose,
'docker_compose_raw' => $this->dockerComposeRaw,
'environment_id' => $environment->id,
'server_id' => (int) $server_id,
]);
Expand Down
39 changes: 35 additions & 4 deletions app/Http/Livewire/Project/New/Select.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
namespace App\Http\Livewire\Project\New;

use App\Models\Server;
use App\Models\StandaloneDocker;
use App\Models\SwarmDocker;
use Countable;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Http;
use Livewire\Component;
use Route;
use Illuminate\Support\Str;

class Select extends Component
{
Expand All @@ -21,6 +21,8 @@ class Select extends Component
public Collection|array $standaloneDockers = [];
public Collection|array $swarmDockers = [];
public array $parameters;
public Collection|array $services = [];
public bool $loadingServices = true;

public ?string $existingPostgresqlUrl = null;

Expand All @@ -44,6 +46,35 @@ public function mount()
// return handleError($e, $this);
// }
// }
public function loadThings()
{
$this->loadServices();
$this->loadServers();
}
public function loadServices(bool $forceReload = false)
{
try {
if ($forceReload) {
Cache::forget('services');
}
$cached = Cache::remember('services', 3600, function () {
$services = Http::get(config('constants.services.offical'));
if ($services->failed()) {
throw new \Exception($services->body());
}

$services = collect($services->json());
$this->emit('success', 'Successfully reloaded services from the internet.');
return $services;
});
$this->services = $cached;
} catch (\Throwable $e) {
ray($e);
return handleError($e, $this);
} finally {
$this->loadingServices = false;
}
}
public function setType(string $type)
{
$this->type = $type;
Expand Down Expand Up @@ -87,7 +118,7 @@ public function setDestination(string $destination_uuid)
]);
}

public function load_servers()
public function loadServers()
{
$this->servers = Server::isUsable()->get();
}
Expand Down
16 changes: 16 additions & 0 deletions app/Http/Livewire/Project/Service/Application.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,39 @@
class Application extends Component
{
public ServiceApplication $application;
public $parameters;
public $fileStorages = null;
protected $listeners = ["refreshFileStorages"];
protected $rules = [
'application.human_name' => 'nullable',
'application.description' => 'nullable',
'application.fqdn' => 'nullable',
'application.ignore_from_status' => 'required|boolean',
];
public function render()
{
return view('livewire.project.service.application');
}
public function instantSave() {
$this->submit();
}
public function refreshFileStorages()
{
$this->fileStorages = $this->application->fileStorages()->get();
}
public function delete()
{
try {
$this->application->delete();
$this->emit('success', 'Application deleted successfully.');
return redirect()->route('project.service', $this->parameters);
} catch (\Throwable $e) {
return handleError($e, $this);
}
}
public function mount()
{
$this->parameters = get_route_parameters();
$this->refreshFileStorages();
}
public function submit()
Expand Down
6 changes: 6 additions & 0 deletions app/Http/Livewire/Project/Service/Database.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,22 @@ class Database extends Component
protected $rules = [
'database.human_name' => 'nullable',
'database.description' => 'nullable',
'database.ignore_from_status' => 'required|boolean',

];
public function render()
{
return view('livewire.project.service.database');
}
public function instantSave() {
$this->submit();
}
public function submit()
{
try {
$this->validate();
$this->database->save();
$this->emit('success', 'Database saved successfully.');
} catch (\Throwable $e) {
ray($e);
} finally {
Expand Down
24 changes: 17 additions & 7 deletions app/Http/Livewire/Project/Service/Index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@
namespace App\Http\Livewire\Project\Service;

use App\Models\Service;
use App\Models\ServiceApplication;
use Livewire\Component;

class Index extends Component
{
public Service $service;

public $applications;
public $databases;
public array $parameters;
public array $query;

protected $rules = [
'service.docker_compose_raw' => 'required',
'service.docker_compose' => 'required',
Expand All @@ -23,19 +26,26 @@ public function mount()
$this->parameters = get_route_parameters();
$this->query = request()->query();
$this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
$this->applications = $this->service->applications->sort();
$this->databases = $this->service->databases->sort();

}
public function render()
{
return view('livewire.project.service.index');
}
public function save()
{
$this->service->save();
$this->service->parse();
$this->service->refresh();
$this->emit('refreshEnvs');
$this->emit('success', 'Service saved successfully.');
$this->service->saveComposeConfigs();
try {
$this->service->save();
$this->service->parse();
$this->service->refresh();
$this->emit('refreshEnvs');
$this->emit('success', 'Service saved successfully.');
$this->service->saveComposeConfigs();
} catch(\Throwable $e) {
return handleError($e, $this);
}
}
public function submit()
{
Expand Down
26 changes: 13 additions & 13 deletions app/Jobs/ContainerStatusJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public function handle(): void
$databases = $this->server->databases();
$services = $this->server->services();
$previews = $this->server->previews();

$this->server->proxyType();
/// Check if proxy is running
$foundProxyContainer = $containers->filter(function ($value, $key) {
Expand Down Expand Up @@ -149,19 +148,20 @@ public function handle(): void
}
$serviceLabelId = data_get($labels, 'coolify.serviceId');
if ($serviceLabelId) {
$coolifyName = data_get($labels, 'coolify.name');
$serviceName = Str::of($coolifyName)->before('-');
$serviceUuid = Str::of($coolifyName)->after('-');
$service = $services->where('uuid', $serviceUuid)->first();
$subType = data_get($labels, 'coolify.service.subType');
$subId = data_get($labels, 'coolify.service.subId');
$service = $services->where('id', $serviceLabelId)->first();
if ($subType === 'application') {
$service = $service->applications()->where('id', $subId)->first();
} else {
$service = $service->databases()->where('id', $subId)->first();
}
if ($service) {
$foundService = $service->byName($serviceName);
if ($foundService) {
$foundServices[] = "$foundService->id-$serviceName";
$statusFromDb = $foundService->status;
if ($statusFromDb !== $containerStatus) {
// ray('Updating status: ' . $containerStatus);
$foundService->update(['status' => $containerStatus]);
}
$foundServices[] = "$service->id-$service->name";
$statusFromDb = $service->status;
if ($statusFromDb !== $containerStatus) {
// ray('Updating status: ' . $containerStatus);
$service->update(['status' => $containerStatus]);
}
}
}
Expand Down
Loading

0 comments on commit 0b11093

Please sign in to comment.