diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php
index 8f4bfdf251..f0e1de8f6c 100644
--- a/app/Actions/Docker/GetContainersStatus.php
+++ b/app/Actions/Docker/GetContainersStatus.php
@@ -6,14 +6,12 @@
use App\Actions\Proxy\CheckProxy;
use App\Actions\Proxy\StartProxy;
use App\Actions\Shared\ComplexStatusCheck;
-use App\Models\Application;
use App\Models\ApplicationPreview;
use App\Models\Server;
use App\Models\ServiceDatabase;
use App\Notifications\Container\ContainerRestarted;
use App\Notifications\Container\ContainerStopped;
use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Log;
use Lorisleiva\Actions\Concerns\AsAction;
class GetContainersStatus
@@ -24,9 +22,9 @@ class GetContainersStatus
public function handle(Server $server)
{
- if (isDev()) {
- $server = Server::find(0);
- }
+ // if (isDev()) {
+ // $server = Server::find(0);
+ // }
$this->server = $server;
if (!$this->server->isFunctional()) {
return 'Server is not ready.';
@@ -154,7 +152,7 @@ private function sentinel()
if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) {
- // TODO: fix this with sentinel
+ // TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else {
return data_get($value, 'name') === "$uuid-proxy";
@@ -316,7 +314,7 @@ private function sentinel()
$this->server->proxyType();
$foundProxyContainer = $containers->filter(function ($value, $key) {
if ($this->server->isSwarm()) {
- // TODO: fix this with sentinel
+ // TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
} else {
return data_get($value, 'name') === 'coolify-proxy';
@@ -442,19 +440,21 @@ private function old_way()
if ($database_id) {
$service_db = ServiceDatabase::where('id', $database_id)->first();
if ($service_db) {
- $uuid = $service_db->service->uuid;
- $isPublic = data_get($service_db, 'is_public');
- if ($isPublic) {
- $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
- if ($this->server->isSwarm()) {
- return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
- } else {
- return data_get($value, 'Name') === "/$uuid-proxy";
+ $uuid = data_get($service_db, 'service.uuid');
+ if ($uuid) {
+ $isPublic = data_get($service_db, 'is_public');
+ if ($isPublic) {
+ $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
+ if ($this->server->isSwarm()) {
+ return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
+ } else {
+ return data_get($value, 'Name') === "/$uuid-proxy";
+ }
+ })->first();
+ if (!$foundTcpProxy) {
+ StartDatabaseProxy::run($service_db);
+ // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
}
- })->first();
- if (!$foundTcpProxy) {
- StartDatabaseProxy::run($service_db);
- // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
}
}
}
diff --git a/app/Jobs/ScheduledTaskJob.php b/app/Jobs/ScheduledTaskJob.php
index 6e2ad06b01..a28f85901f 100644
--- a/app/Jobs/ScheduledTaskJob.php
+++ b/app/Jobs/ScheduledTaskJob.php
@@ -8,14 +8,13 @@
use App\Models\Application;
use App\Models\Service;
use App\Models\Team;
+use App\Notifications\ScheduledTask\TaskFailed;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Collection;
-use Throwable;
class ScheduledTaskJob implements ShouldQueue
{
@@ -114,6 +113,7 @@ public function handle(): void
'message' => $this->task_output ?? $e->getMessage(),
]);
}
+ $this->team?->notify(new TaskFailed($this->task, $e->getMessage()));
// send_internal_notification('ScheduledTaskJob failed with: ' . $e->getMessage());
throw $e;
}
diff --git a/app/Jobs/SendMessageToDiscordJob.php b/app/Jobs/SendMessageToDiscordJob.php
index 31f54f6d69..ddd6bd271c 100644
--- a/app/Jobs/SendMessageToDiscordJob.php
+++ b/app/Jobs/SendMessageToDiscordJob.php
@@ -41,7 +41,6 @@ public function handle(): void
$payload = [
'content' => $this->text,
];
- ray($payload);
Http::post($this->webhookUrl, $payload);
}
}
diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index 2681b69e0e..8f4e870905 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -52,6 +52,9 @@ class Index extends Component
public function mount()
{
+ if (auth()->user()?->isMember() && auth()->user()->currentTeam()->show_boarding === true) {
+ return redirect()->route('dashboard');
+ }
$this->privateKeyName = generate_random_name();
$this->remoteServerName = generate_random_name();
if (isDev()) {
diff --git a/app/Livewire/Notifications/Discord.php b/app/Livewire/Notifications/Discord.php
index 8aad8ccf0b..88705437be 100644
--- a/app/Livewire/Notifications/Discord.php
+++ b/app/Livewire/Notifications/Discord.php
@@ -16,6 +16,7 @@ class Discord extends Component
'team.discord_notifications_deployments' => 'nullable|boolean',
'team.discord_notifications_status_changes' => 'nullable|boolean',
'team.discord_notifications_database_backups' => 'nullable|boolean',
+ 'team.discord_notifications_scheduled_tasks' => 'nullable|boolean',
];
protected $validationAttributes = [
'team.discord_webhook_url' => 'Discord Webhook',
diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php
index 343cbda3ec..6ef9b22553 100644
--- a/app/Livewire/Notifications/Email.php
+++ b/app/Livewire/Notifications/Email.php
@@ -28,6 +28,7 @@ class Email extends Component
'team.smtp_notifications_deployments' => 'nullable|boolean',
'team.smtp_notifications_status_changes' => 'nullable|boolean',
'team.smtp_notifications_database_backups' => 'nullable|boolean',
+ 'team.smtp_notifications_scheduled_tasks' => 'nullable|boolean',
'team.use_instance_email_settings' => 'boolean',
'team.resend_enabled' => 'nullable|boolean',
'team.resend_api_key' => 'nullable',
diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php
index 35b8685274..685c9e8ebb 100644
--- a/app/Livewire/Notifications/Telegram.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -18,10 +18,12 @@ class Telegram extends Component
'team.telegram_notifications_deployments' => 'nullable|boolean',
'team.telegram_notifications_status_changes' => 'nullable|boolean',
'team.telegram_notifications_database_backups' => 'nullable|boolean',
+ 'team.telegram_notifications_scheduled_tasks' => 'nullable|boolean',
'team.telegram_notifications_test_message_thread_id' => 'nullable|string',
'team.telegram_notifications_deployments_message_thread_id' => 'nullable|string',
'team.telegram_notifications_status_changes_message_thread_id' => 'nullable|string',
'team.telegram_notifications_database_backups_message_thread_id' => 'nullable|string',
+ 'team.telegram_notifications_scheduled_tasks_thread_id' => 'nullable|string',
];
protected $validationAttributes = [
'team.telegram_token' => 'Token',
diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 66c59cff50..718312d2dd 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -31,7 +31,7 @@ class General extends Component
public ?string $initialDockerComposeLocation = null;
public ?string $initialDockerComposePrLocation = null;
- public $parsedServices = [];
+ public null|Collection $parsedServices;
public $parsedServiceDomains = [];
protected $listeners = [
@@ -118,6 +118,10 @@ public function mount()
{
try {
$this->parsedServices = $this->application->parseCompose();
+ if (is_null($this->parsedServices) || empty($this->parsedServices)) {
+ $this->dispatch('error', "Failed to parse your docker-compose file. Please check the syntax and try again.");
+ return;
+ }
} catch (\Throwable $e) {
$this->dispatch('error', $e->getMessage());
}
@@ -160,6 +164,10 @@ public function loadComposeFile($isInit = false)
return;
}
['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation, 'initialDockerComposePrLocation' => $this->initialDockerComposePrLocation] = $this->application->loadComposeFile($isInit);
+ if (is_null($this->parsedServices)) {
+ $this->dispatch('error', "Failed to parse your docker-compose file. Please check the syntax and try again.");
+ return;
+ }
$compose = $this->application->parseCompose();
$services = data_get($compose, 'services');
if ($services) {
diff --git a/app/Livewire/Project/Resource/Create.php b/app/Livewire/Project/Resource/Create.php
index 3705d6f933..8ea77950e4 100644
--- a/app/Livewire/Project/Resource/Create.php
+++ b/app/Livewire/Project/Resource/Create.php
@@ -12,7 +12,6 @@ class Create extends Component
public $type;
public function mount()
{
- $services = getServiceTemplates();
$type = str(request()->query('type'));
$destination_uuid = request()->query('destination');
$server_id = request()->query('server_id');
@@ -25,83 +24,87 @@ public function mount()
if (!$environment) {
return redirect()->route('dashboard');
}
- if (in_array($type, DATABASE_TYPES)) {
- if ($type->value() === "postgresql") {
- $database = create_standalone_postgresql($environment->id, $destination_uuid);
- } else if ($type->value() === 'redis') {
- $database = create_standalone_redis($environment->id, $destination_uuid);
- } else if ($type->value() === 'mongodb') {
- $database = create_standalone_mongodb($environment->id, $destination_uuid);
- } else if ($type->value() === 'mysql') {
- $database = create_standalone_mysql($environment->id, $destination_uuid);
- } else if ($type->value() === 'mariadb') {
- $database = create_standalone_mariadb($environment->id, $destination_uuid);
- } else if ($type->value() === 'keydb') {
- $database = create_standalone_keydb($environment->id, $destination_uuid);
- } else if ($type->value() === 'dragonfly') {
- $database = create_standalone_dragonfly($environment->id, $destination_uuid);
- } else if ($type->value() === 'clickhouse') {
- $database = create_standalone_clickhouse($environment->id, $destination_uuid);
- }
- return redirect()->route('project.database.configuration', [
- 'project_uuid' => $project->uuid,
- 'environment_name' => $environment->name,
- 'database_uuid' => $database->uuid,
- ]);
- }
- if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
- $oneClickServiceName = $type->after('one-click-service-')->value();
- $oneClickService = data_get($services, "$oneClickServiceName.compose");
- $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
- if ($oneClickDotEnvs) {
- $oneClickDotEnvs = str(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
- return !empty($value);
- });
- }
- if ($oneClickService) {
- $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
- $service_payload = [
- 'name' => "$oneClickServiceName-" . str()->random(10),
- 'docker_compose_raw' => base64_decode($oneClickService),
- 'environment_id' => $environment->id,
- 'service_type' => $oneClickServiceName,
- 'server_id' => (int) $server_id,
- 'destination_id' => $destination->id,
- 'destination_type' => $destination->getMorphClass(),
- ];
- if ($oneClickServiceName === 'cloudflared') {
- data_set($service_payload, 'connect_to_docker_network', true);
- }
- $service = Service::create($service_payload);
- $service->name = "$oneClickServiceName-" . $service->uuid;
- $service->save();
- if ($oneClickDotEnvs?->count() > 0) {
- $oneClickDotEnvs->each(function ($value) use ($service) {
- $key = str()->before($value, '=');
- $value = str(str()->after($value, '='));
- $generatedValue = $value;
- if ($value->contains('SERVICE_')) {
- $command = $value->after('SERVICE_')->beforeLast('_');
- $generatedValue = generateEnvValue($command->value(), $service);
- }
- EnvironmentVariable::create([
- 'key' => $key,
- 'value' => $generatedValue,
- 'service_id' => $service->id,
- 'is_build_time' => false,
- 'is_preview' => false,
- ]);
- });
+ if (isset($type) && isset($destination_uuid) && isset($server_id)) {
+ $services = getServiceTemplates();
+
+ if (in_array($type, DATABASE_TYPES)) {
+ if ($type->value() === "postgresql") {
+ $database = create_standalone_postgresql($environment->id, $destination_uuid);
+ } else if ($type->value() === 'redis') {
+ $database = create_standalone_redis($environment->id, $destination_uuid);
+ } else if ($type->value() === 'mongodb') {
+ $database = create_standalone_mongodb($environment->id, $destination_uuid);
+ } else if ($type->value() === 'mysql') {
+ $database = create_standalone_mysql($environment->id, $destination_uuid);
+ } else if ($type->value() === 'mariadb') {
+ $database = create_standalone_mariadb($environment->id, $destination_uuid);
+ } else if ($type->value() === 'keydb') {
+ $database = create_standalone_keydb($environment->id, $destination_uuid);
+ } else if ($type->value() === 'dragonfly') {
+ $database = create_standalone_dragonfly($environment->id, $destination_uuid);
+ } else if ($type->value() === 'clickhouse') {
+ $database = create_standalone_clickhouse($environment->id, $destination_uuid);
}
- $service->parse(isNew: true);
- return redirect()->route('project.service.configuration', [
- 'service_uuid' => $service->uuid,
- 'environment_name' => $environment->name,
+ return redirect()->route('project.database.configuration', [
'project_uuid' => $project->uuid,
+ 'environment_name' => $environment->name,
+ 'database_uuid' => $database->uuid,
]);
}
+ if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
+ $oneClickServiceName = $type->after('one-click-service-')->value();
+ $oneClickService = data_get($services, "$oneClickServiceName.compose");
+ $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
+ if ($oneClickDotEnvs) {
+ $oneClickDotEnvs = str(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+ return !empty($value);
+ });
+ }
+ if ($oneClickService) {
+ $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
+ $service_payload = [
+ 'name' => "$oneClickServiceName-" . str()->random(10),
+ 'docker_compose_raw' => base64_decode($oneClickService),
+ 'environment_id' => $environment->id,
+ 'service_type' => $oneClickServiceName,
+ 'server_id' => (int) $server_id,
+ 'destination_id' => $destination->id,
+ 'destination_type' => $destination->getMorphClass(),
+ ];
+ if ($oneClickServiceName === 'cloudflared') {
+ data_set($service_payload, 'connect_to_docker_network', true);
+ }
+ $service = Service::create($service_payload);
+ $service->name = "$oneClickServiceName-" . $service->uuid;
+ $service->save();
+ if ($oneClickDotEnvs?->count() > 0) {
+ $oneClickDotEnvs->each(function ($value) use ($service) {
+ $key = str()->before($value, '=');
+ $value = str(str()->after($value, '='));
+ $generatedValue = $value;
+ if ($value->contains('SERVICE_')) {
+ $command = $value->after('SERVICE_')->beforeLast('_');
+ $generatedValue = generateEnvValue($command->value(), $service);
+ }
+ EnvironmentVariable::create([
+ 'key' => $key,
+ 'value' => $generatedValue,
+ 'service_id' => $service->id,
+ 'is_build_time' => false,
+ 'is_preview' => false,
+ ]);
+ });
+ }
+ $service->parse(isNew: true);
+ return redirect()->route('project.service.configuration', [
+ 'service_uuid' => $service->uuid,
+ 'environment_name' => $environment->name,
+ 'project_uuid' => $project->uuid,
+ ]);
+ }
+ }
+ $this->type = $type->value();
}
- $this->type = $type->value();
}
public function render()
{
diff --git a/app/Livewire/Team/AdminView.php b/app/Livewire/Team/AdminView.php
new file mode 100644
index 0000000000..12546ff1b5
--- /dev/null
+++ b/app/Livewire/Team/AdminView.php
@@ -0,0 +1,117 @@
+route('dashboard');
+ }
+ $this->getUsers();
+ }
+ public function submitSearch()
+ {
+ if ($this->search !== "") {
+ $this->users = User::where(function ($query) {
+ $query->where('name', 'like', "%{$this->search}%")
+ ->orWhere('email', 'like', "%{$this->search}%");
+ })->get()->filter(function ($user) {
+ return $user->id !== auth()->id();
+ });
+ } else {
+ $this->getUsers();
+ }
+ }
+ public function getUsers()
+ {
+ $this->users = User::where('id', '!=', auth()->id())->get();
+ // $this->users = User::all();
+ }
+ private function finalizeDeletion(User $user, Team $team)
+ {
+ $servers = $team->servers;
+ foreach ($servers as $server) {
+ $resources = $server->definedResources();
+ foreach ($resources as $resource) {
+ ray("Deleting resource: " . $resource->name);
+ $resource->forceDelete();
+ }
+ ray("Deleting server: " . $server->name);
+ $server->forceDelete();
+ }
+
+ $projects = $team->projects;
+ foreach ($projects as $project) {
+ ray("Deleting project: " . $project->name);
+ $project->forceDelete();
+ }
+ $team->members()->detach($user->id);
+ ray('Deleting team: ' . $team->name);
+ $team->delete();
+ }
+ public function delete($id)
+ {
+ $user = User::find($id);
+ $teams = $user->teams;
+ foreach ($teams as $team) {
+ ray($team->name);
+ $user_alone_in_team = $team->members->count() === 1;
+ if ($team->id === 0) {
+ if ($user_alone_in_team) {
+ ray('user is alone in the root team, do nothing');
+ return $this->dispatch('error', 'User is alone in the root team, cannot delete');
+ }
+ }
+ if ($user_alone_in_team) {
+ ray('user is alone in the team');
+ $this->finalizeDeletion($user, $team);
+ continue;
+ }
+ ray('user is not alone in the team');
+ if ($user->isOwner()) {
+ $found_other_owner_or_admin = $team->members->filter(function ($member) {
+ return $member->pivot->role === 'owner' || $member->pivot->role === 'admin';
+ })->where('id', '!=', $user->id)->first();
+
+ if ($found_other_owner_or_admin) {
+ ray('found other owner or admin');
+ $team->members()->detach($user->id);
+ continue;
+ } else {
+ $found_other_member_who_is_not_owner = $team->members->filter(function ($member) {
+ return $member->pivot->role === 'member';
+ })->first();
+ if ($found_other_member_who_is_not_owner) {
+ ray('found other member who is not owner');
+ $found_other_member_who_is_not_owner->pivot->role = 'owner';
+ $found_other_member_who_is_not_owner->pivot->save();
+ $team->members()->detach($user->id);
+ } else {
+ // This should never happen as if the user is the only member in the team, the team should be deleted already.
+ ray('found no other member who is not owner');
+ $this->finalizeDeletion($user, $team);
+ }
+ continue;
+ }
+ } else {
+ ray('user is not owner');
+ $team->members()->detach($user->id);
+ }
+ }
+ ray("Deleting user: " . $user->name);
+ $user->delete();
+ $this->getUsers();
+ }
+ public function render()
+ {
+ return view('livewire.team.admin-view');
+ }
+}
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 3d0b92aafa..0f3425dd60 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -113,6 +113,18 @@ public function link()
}
return null;
}
+ public function failedTaskLink($task_uuid)
+ {
+ if (data_get($this, 'environment.project.uuid')) {
+ return route('project.application.scheduled-tasks', [
+ 'project_uuid' => data_get($this, 'environment.project.uuid'),
+ 'environment_name' => data_get($this, 'environment.name'),
+ 'application_uuid' => data_get($this, 'uuid'),
+ 'task_uuid' => $task_uuid
+ ]);
+ }
+ return null;
+ }
public function settings()
{
return $this->hasOne(ApplicationSetting::class);
@@ -879,7 +891,7 @@ function loadComposeFile($isInit = false)
if (!$composeFileContent) {
$this->docker_compose_location = $initialDockerComposeLocation;
$this->save();
- throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile");
+ throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile
+{{ $output }}
+
+
+Click [here]({{ $url }}) to view the task.
+