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

Merge branch 'next' into next

Browse Source
This commit is contained in:
Leonardo Cabeza
2024-08-07 18:20:30 -05:00
committed by GitHub
parent 868bbaf5a9 0b000919cf
commit 20acb4363b
99 changed files with 1992 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
.github/workflows/fix-php-code-style-issues.yml → .github/workflows/fix-php-code-style-issues vendored
View File

81
.github/workflows/pr-build.yml vendored Normal file
View File

@@ -0,0 +1,81 @@
name: PR Build (v4)
on:
pull_request:
types:
- opened
branches-ignore: ["main", "v3"]
paths-ignore:
- .github/workflows/coolify-helper.yml
- docker/coolify-helper/Dockerfile
env:
REGISTRY: ghcr.io
IMAGE_NAME: "coollabsio/coolify"
jobs:
amd64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Login to ghcr.io
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build image and push to registry
uses: docker/build-push-action@v5
with:
context: .
file: docker/prod/Dockerfile
platforms: linux/amd64
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.number }}
aarch64:
runs-on: [self-hosted, arm64]
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v4
- name: Login to ghcr.io
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build image and push to registry
uses: docker/build-push-action@v5
with:
context: .
file: docker/prod/Dockerfile
platforms: linux/aarch64
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.number }}-aarch64
merge-manifest:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
needs: [amd64, aarch64]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to ghcr.io
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Create & publish manifest
run: |
docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.number }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.number }}
- uses: sarisia/actions-status-discord@v1
if: always()
with:
webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}

8
app/Actions/Application/StopApplication.php
View File

@@ -31,15 +31,13 @@ class StopApplication
} else { } else {
$containers = getCurrentApplicationContainerStatus($server, $application->id, 0); $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
} }
ray($containers);
if ($containers->count() > 0) { if ($containers->count() > 0) {
foreach ($containers as $container) { foreach ($containers as $container) {
$containerName = data_get($container, 'Names'); $containerName = data_get($container, 'Names');
if ($containerName) { if ($containerName) {
instant_remote_process( instant_remote_process(command: ["docker stop --time=30 $containerName"], server: $server, throwError: false);
["docker rm -f {$containerName}"], instant_remote_process(command: ["docker rm $containerName"], server: $server, throwError: false);
$server instant_remote_process(command: ["docker rm -f {$containerName}"], server: $server, throwError: false);
);
} }
} }
} }

9
app/Actions/Database/StopDatabase.php
View File

@@ -22,10 +22,11 @@ class StopDatabase
if (! $server->isFunctional()) { if (! $server->isFunctional()) {
return 'Server is not functional'; return 'Server is not functional';
} }
instant_remote_process(
["docker rm -f {$database->uuid}"], instant_remote_process(command: ["docker stop --time=30 $database->uuid"], server: $server, throwError: false);
$server instant_remote_process(command: ["docker rm $database->uuid"], server: $server, throwError: false);
); instant_remote_process(command: ["docker rm -f $database->uuid"], server: $server, throwError: false);
if ($database->is_public) { if ($database->is_public) {
StopDatabaseProxy::run($database); StopDatabaseProxy::run($database);
} }

588
app/Actions/Docker/GetContainersStatus.php
View File

@@ -12,6 +12,7 @@ use App\Models\ServiceDatabase;
use App\Notifications\Container\ContainerRestarted; use App\Notifications\Container\ContainerRestarted;
use App\Notifications\Container\ContainerStopped; use App\Notifications\Container\ContainerStopped;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
class GetContainersStatus class GetContainersStatus
@@ -20,13 +21,16 @@ class GetContainersStatus
public $applications; public $applications;
public ?Collection $containers;
public ?Collection $containerReplicates;
public $server; public $server;
public function handle(Server $server) public function handle(Server $server, ?Collection $containers = null, ?Collection $containerReplicates = null)
{ {
// if (isDev()) { $this->containers = $containers;
// $server = Server::find(0); $this->containerReplicates = $containerReplicates;
// }
$this->server = $server; $this->server = $server;
if (! $this->server->isFunctional()) { if (! $this->server->isFunctional()) {
return 'Server is not ready.'; return 'Server is not ready.';
@@ -66,322 +70,312 @@ class GetContainersStatus
// } // }
} }
private function sentinel() // private function sentinel()
{ // {
try { // try {
$containers = $this->server->getContainers(); // $this->containers = $this->server->getContainersWithSentinel();
if ($containers->count() === 0) { // if ($this->containers->count() === 0) {
return; // return;
} // }
$databases = $this->server->databases(); // $databases = $this->server->databases();
$services = $this->server->services()->get(); // $services = $this->server->services()->get();
$previews = $this->server->previews(); // $previews = $this->server->previews();
$foundApplications = []; // $foundApplications = [];
$foundApplicationPreviews = []; // $foundApplicationPreviews = [];
$foundDatabases = []; // $foundDatabases = [];
$foundServices = []; // $foundServices = [];
foreach ($containers as $container) { // foreach ($this->containers as $container) {
$labels = Arr::undot(data_get($container, 'labels')); // $labels = Arr::undot(data_get($container, 'labels'));
$containerStatus = data_get($container, 'state'); // $containerStatus = data_get($container, 'state');
$containerHealth = data_get($container, 'health_status', 'unhealthy'); // $containerHealth = data_get($container, 'health_status', 'unhealthy');
$containerStatus = "$containerStatus ($containerHealth)"; // $containerStatus = "$containerStatus ($containerHealth)";
$applicationId = data_get($labels, 'coolify.applicationId'); // $applicationId = data_get($labels, 'coolify.applicationId');
if ($applicationId) { // if ($applicationId) {
$pullRequestId = data_get($labels, 'coolify.pullRequestId'); // $pullRequestId = data_get($labels, 'coolify.pullRequestId');
if ($pullRequestId) { // if ($pullRequestId) {
if (str($applicationId)->contains('-')) { // if (str($applicationId)->contains('-')) {
$applicationId = str($applicationId)->before('-'); // $applicationId = str($applicationId)->before('-');
} // }
$preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first(); // $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
if ($preview) { // if ($preview) {
$foundApplicationPreviews[] = $preview->id; // $foundApplicationPreviews[] = $preview->id;
$statusFromDb = $preview->status; // $statusFromDb = $preview->status;
if ($statusFromDb !== $containerStatus) { // if ($statusFromDb !== $containerStatus) {
$preview->update(['status' => $containerStatus]); // $preview->update(['status' => $containerStatus]);
} // }
} else { // } else {
//Notify user that this container should not be there. // //Notify user that this container should not be there.
} // }
} else { // } else {
$application = $this->applications->where('id', $applicationId)->first(); // $application = $this->applications->where('id', $applicationId)->first();
if ($application) { // if ($application) {
$foundApplications[] = $application->id; // $foundApplications[] = $application->id;
$statusFromDb = $application->status; // $statusFromDb = $application->status;
if ($statusFromDb !== $containerStatus) { // if ($statusFromDb !== $containerStatus) {
$application->update(['status' => $containerStatus]); // $application->update(['status' => $containerStatus]);
} // }
} else { // } else {
//Notify user that this container should not be there. // //Notify user that this container should not be there.
} // }
} // }
} else { // } else {
$uuid = data_get($labels, 'com.docker.compose.service'); // $uuid = data_get($labels, 'com.docker.compose.service');
$type = data_get($labels, 'coolify.type'); // $type = data_get($labels, 'coolify.type');
if ($uuid) { // if ($uuid) {
if ($type === 'service') { // if ($type === 'service') {
$database_id = data_get($labels, 'coolify.service.subId'); // $database_id = data_get($labels, 'coolify.service.subId');
if ($database_id) { // if ($database_id) {
$service_db = ServiceDatabase::where('id', $database_id)->first(); // $service_db = ServiceDatabase::where('id', $database_id)->first();
if ($service_db) { // if ($service_db) {
$uuid = $service_db->service->uuid; // $uuid = $service_db->service->uuid;
$isPublic = data_get($service_db, 'is_public'); // $isPublic = data_get($service_db, 'is_public');
if ($isPublic) { // if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) { // $foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) { // if ($this->server->isSwarm()) {
// TODO: fix this with sentinel // // TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid"; // return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else { // } else {
return data_get($value, 'name') === "$uuid-proxy"; // return data_get($value, 'name') === "$uuid-proxy";
} // }
})->first(); // })->first();
if (! $foundTcpProxy) { // if (! $foundTcpProxy) {
StartDatabaseProxy::run($service_db); // StartDatabaseProxy::run($service_db);
// $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server)); // // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
} // }
} // }
} // }
} // }
} else { // } else {
$database = $databases->where('uuid', $uuid)->first(); // $database = $databases->where('uuid', $uuid)->first();
if ($database) { // if ($database) {
$isPublic = data_get($database, 'is_public'); // $isPublic = data_get($database, 'is_public');
$foundDatabases[] = $database->id; // $foundDatabases[] = $database->id;
$statusFromDb = $database->status; // $statusFromDb = $database->status;
if ($statusFromDb !== $containerStatus) { // if ($statusFromDb !== $containerStatus) {
$database->update(['status' => $containerStatus]); // $database->update(['status' => $containerStatus]);
} // }
if ($isPublic) { // if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) { // $foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) { // if ($this->server->isSwarm()) {
// TODO: fix this with sentinel // // TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid"; // return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else { // } else {
return data_get($value, 'name') === "$uuid-proxy"; // return data_get($value, 'name') === "$uuid-proxy";
} // }
})->first(); // })->first();
if (! $foundTcpProxy) { // if (! $foundTcpProxy) {
StartDatabaseProxy::run($database); // StartDatabaseProxy::run($database);
$this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server)); // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
} // }
} // }
} else { // } else {
// Notify user that this container should not be there. // // Notify user that this container should not be there.
} // }
} // }
} // }
if (data_get($container, 'name') === 'coolify-db') { // if (data_get($container, 'name') === 'coolify-db') {
$foundDatabases[] = 0; // $foundDatabases[] = 0;
} // }
} // }
$serviceLabelId = data_get($labels, 'coolify.serviceId'); // $serviceLabelId = data_get($labels, 'coolify.serviceId');
if ($serviceLabelId) { // if ($serviceLabelId) {
$subType = data_get($labels, 'coolify.service.subType'); // $subType = data_get($labels, 'coolify.service.subType');
$subId = data_get($labels, 'coolify.service.subId'); // $subId = data_get($labels, 'coolify.service.subId');
$service = $services->where('id', $serviceLabelId)->first(); // $service = $services->where('id', $serviceLabelId)->first();
if (! $service) { // if (! $service) {
continue; // continue;
} // }
if ($subType === 'application') { // if ($subType === 'application') {
$service = $service->applications()->where('id', $subId)->first(); // $service = $service->applications()->where('id', $subId)->first();
} else { // } else {
$service = $service->databases()->where('id', $subId)->first(); // $service = $service->databases()->where('id', $subId)->first();
} // }
if ($service) { // if ($service) {
$foundServices[] = "$service->id-$service->name"; // $foundServices[] = "$service->id-$service->name";
$statusFromDb = $service->status; // $statusFromDb = $service->status;
if ($statusFromDb !== $containerStatus) { // if ($statusFromDb !== $containerStatus) {
// ray('Updating status: ' . $containerStatus); // // ray('Updating status: ' . $containerStatus);
$service->update(['status' => $containerStatus]); // $service->update(['status' => $containerStatus]);
} // }
} // }
} // }
} // }
$exitedServices = collect([]); // $exitedServices = collect([]);
foreach ($services as $service) { // foreach ($services as $service) {
$apps = $service->applications()->get(); // $apps = $service->applications()->get();
$dbs = $service->databases()->get(); // $dbs = $service->databases()->get();
foreach ($apps as $app) { // foreach ($apps as $app) {
if (in_array("$app->id-$app->name", $foundServices)) { // if (in_array("$app->id-$app->name", $foundServices)) {
continue; // continue;
} else { // } else {
$exitedServices->push($app); // $exitedServices->push($app);
} // }
} // }
foreach ($dbs as $db) { // foreach ($dbs as $db) {
if (in_array("$db->id-$db->name", $foundServices)) { // if (in_array("$db->id-$db->name", $foundServices)) {
continue; // continue;
} else { // } else {
$exitedServices->push($db); // $exitedServices->push($db);
} // }
} // }
} // }
$exitedServices = $exitedServices->unique('id'); // $exitedServices = $exitedServices->unique('id');
foreach ($exitedServices as $exitedService) { // foreach ($exitedServices as $exitedService) {
if (str($exitedService->status)->startsWith('exited')) { // if (str($exitedService->status)->startsWith('exited')) {
continue; // continue;
} // }
$name = data_get($exitedService, 'name'); // $name = data_get($exitedService, 'name');
$fqdn = data_get($exitedService, 'fqdn'); // $fqdn = data_get($exitedService, 'fqdn');
if ($name) { // if ($name) {
if ($fqdn) { // if ($fqdn) {
$containerName = "$name, available at $fqdn"; // $containerName = "$name, available at $fqdn";
} else { // } else {
$containerName = $name; // $containerName = $name;
} // }
} else { // } else {
if ($fqdn) { // if ($fqdn) {
$containerName = $fqdn; // $containerName = $fqdn;
} else { // } else {
$containerName = null; // $containerName = null;
} // }
} // }
$projectUuid = data_get($service, 'environment.project.uuid'); // $projectUuid = data_get($service, 'environment.project.uuid');
$serviceUuid = data_get($service, 'uuid'); // $serviceUuid = data_get($service, 'uuid');
$environmentName = data_get($service, 'environment.name'); // $environmentName = data_get($service, 'environment.name');
if ($projectUuid && $serviceUuid && $environmentName) { // if ($projectUuid && $serviceUuid && $environmentName) {
$url = base_url().'/project/'.$projectUuid.'/'.$environmentName.'/service/'.$serviceUuid; // $url = base_url().'/project/'.$projectUuid.'/'.$environmentName.'/service/'.$serviceUuid;
} else { // } else {
$url = null; // $url = null;
} // }
// $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url)); // // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
$exitedService->update(['status' => 'exited']); // $exitedService->update(['status' => 'exited']);
} // }
$notRunningApplications = $this->applications->pluck('id')->diff($foundApplications); // $notRunningApplications = $this->applications->pluck('id')->diff($foundApplications);
foreach ($notRunningApplications as $applicationId) { // foreach ($notRunningApplications as $applicationId) {
$application = $this->applications->where('id', $applicationId)->first(); // $application = $this->applications->where('id', $applicationId)->first();
if (str($application->status)->startsWith('exited')) { // if (str($application->status)->startsWith('exited')) {
continue; // continue;
} // }
$application->update(['status' => 'exited']); // $application->update(['status' => 'exited']);
$name = data_get($application, 'name'); // $name = data_get($application, 'name');
$fqdn = data_get($application, 'fqdn'); // $fqdn = data_get($application, 'fqdn');
$containerName = $name ? "$name ($fqdn)" : $fqdn; // $containerName = $name ? "$name ($fqdn)" : $fqdn;
$projectUuid = data_get($application, 'environment.project.uuid'); // $projectUuid = data_get($application, 'environment.project.uuid');
$applicationUuid = data_get($application, 'uuid'); // $applicationUuid = data_get($application, 'uuid');
$environment = data_get($application, 'environment.name'); // $environment = data_get($application, 'environment.name');
if ($projectUuid && $applicationUuid && $environment) { // if ($projectUuid && $applicationUuid && $environment) {
$url = base_url().'/project/'.$projectUuid.'/'.$environment.'/application/'.$applicationUuid; // $url = base_url().'/project/'.$projectUuid.'/'.$environment.'/application/'.$applicationUuid;
} else { // } else {
$url = null; // $url = null;
} // }
// $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url)); // // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
} // }
$notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews); // $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
foreach ($notRunningApplicationPreviews as $previewId) { // foreach ($notRunningApplicationPreviews as $previewId) {
$preview = $previews->where('id', $previewId)->first(); // $preview = $previews->where('id', $previewId)->first();
if (str($preview->status)->startsWith('exited')) { // if (str($preview->status)->startsWith('exited')) {
continue; // continue;
} // }
$preview->update(['status' => 'exited']); // $preview->update(['status' => 'exited']);
$name = data_get($preview, 'name'); // $name = data_get($preview, 'name');
$fqdn = data_get($preview, 'fqdn'); // $fqdn = data_get($preview, 'fqdn');
$containerName = $name ? "$name ($fqdn)" : $fqdn; // $containerName = $name ? "$name ($fqdn)" : $fqdn;
$projectUuid = data_get($preview, 'application.environment.project.uuid'); // $projectUuid = data_get($preview, 'application.environment.project.uuid');
$environmentName = data_get($preview, 'application.environment.name'); // $environmentName = data_get($preview, 'application.environment.name');
$applicationUuid = data_get($preview, 'application.uuid'); // $applicationUuid = data_get($preview, 'application.uuid');
if ($projectUuid && $applicationUuid && $environmentName) { // if ($projectUuid && $applicationUuid && $environmentName) {
$url = base_url().'/project/'.$projectUuid.'/'.$environmentName.'/application/'.$applicationUuid; // $url = base_url().'/project/'.$projectUuid.'/'.$environmentName.'/application/'.$applicationUuid;
} else { // } else {
$url = null; // $url = null;
} // }
// $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url)); // // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
} // }
$notRunningDatabases = $databases->pluck('id')->diff($foundDatabases); // $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
foreach ($notRunningDatabases as $database) { // foreach ($notRunningDatabases as $database) {
$database = $databases->where('id', $database)->first(); // $database = $databases->where('id', $database)->first();
if (str($database->status)->startsWith('exited')) { // if (str($database->status)->startsWith('exited')) {
continue; // continue;
} // }
$database->update(['status' => 'exited']); // $database->update(['status' => 'exited']);
$name = data_get($database, 'name'); // $name = data_get($database, 'name');
$fqdn = data_get($database, 'fqdn'); // $fqdn = data_get($database, 'fqdn');
$containerName = $name; // $containerName = $name;
$projectUuid = data_get($database, 'environment.project.uuid'); // $projectUuid = data_get($database, 'environment.project.uuid');
$environmentName = data_get($database, 'environment.name'); // $environmentName = data_get($database, 'environment.name');
$databaseUuid = data_get($database, 'uuid'); // $databaseUuid = data_get($database, 'uuid');
if ($projectUuid && $databaseUuid && $environmentName) { // if ($projectUuid && $databaseUuid && $environmentName) {
$url = base_url().'/project/'.$projectUuid.'/'.$environmentName.'/database/'.$databaseUuid; // $url = base_url().'/project/'.$projectUuid.'/'.$environmentName.'/database/'.$databaseUuid;
} else { // } else {
$url = null; // $url = null;
} // }
// $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url)); // // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
} // }
// Check if proxy is running // // Check if proxy is running
$this->server->proxyType(); // $this->server->proxyType();
$foundProxyContainer = $containers->filter(function ($value, $key) { // $foundProxyContainer = $this->containers->filter(function ($value, $key) {
if ($this->server->isSwarm()) { // if ($this->server->isSwarm()) {
// TODO: fix this with sentinel // // TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik'; // return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
} else { // } else {
return data_get($value, 'name') === 'coolify-proxy'; // return data_get($value, 'name') === 'coolify-proxy';
} // }
})->first(); // })->first();
if (! $foundProxyContainer) { // if (! $foundProxyContainer) {
try { // try {
$shouldStart = CheckProxy::run($this->server); // $shouldStart = CheckProxy::run($this->server);
if ($shouldStart) { // if ($shouldStart) {
StartProxy::run($this->server, false); // StartProxy::run($this->server, false);
$this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server)); // $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
} // }
} catch (\Throwable $e) { // } catch (\Throwable $e) {
ray($e); // ray($e);
} // }
} else { // } else {
$this->server->proxy->status = data_get($foundProxyContainer, 'state'); // $this->server->proxy->status = data_get($foundProxyContainer, 'state');
$this->server->save(); // $this->server->save();
$connectProxyToDockerNetworks = connectProxyToNetworks($this->server); // $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
instant_remote_process($connectProxyToDockerNetworks, $this->server, false); // instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
} // }
} catch (\Exception $e) { // } catch (\Exception $e) {
// send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage()); // // send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
ray($e->getMessage()); // ray($e->getMessage());
return handleError($e); // return handleError($e);
} // }
} // }
private function old_way() private function old_way()
{ {
if ($this->server->isSwarm()) { if ($this->containers === null) {
$containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false); ['containers' => $this->containers,'containerReplicates' => $this->containerReplicates] = $this->server->getContainers();
$containerReplicates = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
} else {
// Precheck for containers
$containers = instant_remote_process(['docker container ls -q'], $this->server, false);
if (! $containers) {
return;
}
$containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server, false);
$containerReplicates = null;
} }
if (is_null($containers)) {
if (is_null($this->containers)) {
return; return;
} }
$containers = format_docker_command_output_to_json($containers); if ($this->containerReplicates) {
if ($containerReplicates) { foreach ($this->containerReplicates as $containerReplica) {
$containerReplicates = format_docker_command_output_to_json($containerReplicates);
foreach ($containerReplicates as $containerReplica) {
$name = data_get($containerReplica, 'Name'); $name = data_get($containerReplica, 'Name');
$containers = $containers->map(function ($container) use ($name, $containerReplica) { $this->containers = $this->containers->map(function ($container) use ($name, $containerReplica) {
if (data_get($container, 'Spec.Name') === $name) { if (data_get($container, 'Spec.Name') === $name) {
$replicas = data_get($containerReplica, 'Replicas'); $replicas = data_get($containerReplica, 'Replicas');
$running = str($replicas)->explode('/')[0]; $running = str($replicas)->explode('/')[0];
@@ -407,7 +401,7 @@ class GetContainersStatus
$foundDatabases = []; $foundDatabases = [];
$foundServices = []; $foundServices = [];
foreach ($containers as $container) { foreach ($this->containers as $container) {
if ($this->server->isSwarm()) { if ($this->server->isSwarm()) {
$labels = data_get($container, 'Spec.Labels'); $labels = data_get($container, 'Spec.Labels');
$uuid = data_get($labels, 'coolify.name'); $uuid = data_get($labels, 'coolify.name');
@@ -461,7 +455,7 @@ class GetContainersStatus
if ($uuid) { if ($uuid) {
$isPublic = data_get($service_db, 'is_public'); $isPublic = data_get($service_db, 'is_public');
if ($isPublic) { if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) { $foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) { if ($this->server->isSwarm()) {
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid"; return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else { } else {
@@ -486,7 +480,7 @@ class GetContainersStatus
$database->update(['status' => $containerStatus]); $database->update(['status' => $containerStatus]);
} }
if ($isPublic) { if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) { $foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) { if ($this->server->isSwarm()) {
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid"; return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else { } else {
@@ -659,7 +653,7 @@ class GetContainersStatus
// Check if proxy is running // Check if proxy is running
$this->server->proxyType(); $this->server->proxyType();
$foundProxyContainer = $containers->filter(function ($value, $key) { $foundProxyContainer = $this->containers->filter(function ($value, $key) {
if ($this->server->isSwarm()) { if ($this->server->isSwarm()) {
return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik'; return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
} else { } else {

11
app/Actions/Server/CleanupDocker.php
View File

@@ -11,7 +11,6 @@ class CleanupDocker
public function handle(Server $server, bool $force = true) public function handle(Server $server, bool $force = true)
{ {
// cleanup docker images, containers, and builder caches // cleanup docker images, containers, and builder caches
if ($force) { if ($force) {
instant_remote_process(['docker image prune -af'], $server, false); instant_remote_process(['docker image prune -af'], $server, false);
@@ -22,15 +21,5 @@ class CleanupDocker
instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server, false); instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server, false);
instant_remote_process(['docker builder prune -f'], $server, false); instant_remote_process(['docker builder prune -f'], $server, false);
} }
// cleanup networks
// $networks = collectDockerNetworksByServer($server);
// $proxyNetworks = collectProxyDockerNetworksByServer($server);
// $diff = $proxyNetworks->diff($networks);
// if ($diff->count() > 0) {
// $diff->map(function ($network) use ($server) {
// instant_remote_process(["docker network disconnect $network coolify-proxy"], $server);
// instant_remote_process(["docker network rm $network"], $server);
// });
// }
} }
} }

7
app/Actions/Server/InstallLogDrain.php
View File

@@ -24,12 +24,7 @@ class InstallLogDrain
} }
try { try {
if ($type === 'none') { if ($type === 'none') {
$command = [ return 'No log drain is enabled.';
"echo 'Stopping old Fluent Bit'",
'docker rm -f coolify-log-drain || true',
];
return instant_remote_process($command, $server);
} elseif ($type === 'newrelic') { } elseif ($type === 'newrelic') {
if (! $server->settings->is_logdrain_newrelic_enabled) { if (! $server->settings->is_logdrain_newrelic_enabled) {
throw new \Exception('New Relic log drain is not enabled.'); throw new \Exception('New Relic log drain is not enabled.');

20
app/Actions/Server/StopLogDrain.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
namespace App\Actions\Server;
use App\Models\Server;
use Lorisleiva\Actions\Concerns\AsAction;
class StopLogDrain
{
use AsAction;
public function handle(Server $server)
{
try {
return instant_remote_process(['docker rm -f coolify-log-drain || true'], $server);
} catch (\Throwable $e) {
return handleError($e);
}
}
}

2
app/Actions/Server/UpdateCoolify.php
View File

@@ -20,7 +20,6 @@ class UpdateCoolify
{ {
try { try {
$settings = InstanceSettings::get(); $settings = InstanceSettings::get();
ray('Running InstanceAutoUpdateJob');
$this->server = Server::find(0); $this->server = Server::find(0);
if (! $this->server) { if (! $this->server) {
return; return;
@@ -48,7 +47,6 @@ class UpdateCoolify
private function update() private function update()
{ {
if (isDev()) { if (isDev()) {
ray('Running in dev mode');
remote_process([ remote_process([
'sleep 10', 'sleep 10',
], $this->server); ], $this->server);

9
app/Actions/Service/StopService.php
View File

@@ -19,18 +19,21 @@ class StopService
ray('Stopping service: '.$service->name); ray('Stopping service: '.$service->name);
$applications = $service->applications()->get(); $applications = $service->applications()->get();
foreach ($applications as $application) { foreach ($applications as $application) {
instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server, false); instant_remote_process(command: ["docker stop --time=30 {$application->name}-{$service->uuid}"], server: $server, throwError: false);
instant_remote_process(command: ["docker rm {$application->name}-{$service->uuid}"], server: $server, throwError: false);
instant_remote_process(command: ["docker rm -f {$application->name}-{$service->uuid}"], server: $server, throwError: false);
$application->update(['status' => 'exited']); $application->update(['status' => 'exited']);
} }
$dbs = $service->databases()->get(); $dbs = $service->databases()->get();
foreach ($dbs as $db) { foreach ($dbs as $db) {
instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server, false); instant_remote_process(command: ["docker stop --time=30 {$db->name}-{$service->uuid}"], server: $server, throwError: false);
instant_remote_process(command: ["docker rm {$db->name}-{$service->uuid}"], server: $server, throwError: false);
instant_remote_process(command: ["docker rm -f {$db->name}-{$service->uuid}"], server: $server, throwError: false);
$db->update(['status' => 'exited']); $db->update(['status' => 'exited']);
} }
instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy"], $service->server); instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy"], $service->server);
instant_remote_process(["docker network rm {$service->uuid}"], $service->server); instant_remote_process(["docker network rm {$service->uuid}"], $service->server);
} catch (\Exception $e) { } catch (\Exception $e) {
echo $e->getMessage();
ray($e->getMessage()); ray($e->getMessage());
return $e->getMessage(); return $e->getMessage();

1
app/Console/Commands/CleanupDatabase.php
View File

@@ -19,6 +19,7 @@ class CleanupDatabase extends Command
echo "Running database cleanup in dry-run mode...\n"; echo "Running database cleanup in dry-run mode...\n";
} }
if (isCloud()) { if (isCloud()) {
// Later on we can increase this to 180 days or dynamically set
$keep_days = 60; $keep_days = 60;
} else { } else {
$keep_days = 60; $keep_days = 60;

101
app/Console/Commands/Init.php
View File

@@ -3,6 +3,7 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Actions\Server\StopSentinel; use App\Actions\Server\StopSentinel;
use App\Enums\ActivityTypes;
use App\Enums\ApplicationDeploymentStatus; use App\Enums\ApplicationDeploymentStatus;
use App\Jobs\CleanupHelperContainersJob; use App\Jobs\CleanupHelperContainersJob;
use App\Models\ApplicationDeploymentQueue; use App\Models\ApplicationDeploymentQueue;
@@ -12,22 +13,27 @@ use App\Models\ScheduledDatabaseBackup;
use App\Models\Server; use App\Models\Server;
use App\Models\StandalonePostgresql; use App\Models\StandalonePostgresql;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
class Init extends Command class Init extends Command
{ {
protected $signature = 'app:init {--full-cleanup} {--cleanup-deployments}'; protected $signature = 'app:init {--full-cleanup} {--cleanup-deployments} {--cleanup-proxy-networks}';
protected $description = 'Cleanup instance related stuffs'; protected $description = 'Cleanup instance related stuffs';
public $servers = null;
public function handle() public function handle()
{ {
$this->servers = Server::all();
$this->alive(); $this->alive();
get_public_ips(); get_public_ips();
if (version_compare('4.0.0-beta.312', config('version'), '<=')) { if (version_compare('4.0.0-beta.312', config('version'), '<=')) {
$servers = Server::all(); foreach ($this->servers as $server) {
foreach ($servers as $server) { if ($server->settings->is_metrics_enabled === true) {
$server->settings->update(['is_metrics_enabled' => false]); $server->settings->update(['is_metrics_enabled' => false]);
}
if ($server->isFunctional()) { if ($server->isFunctional()) {
StopSentinel::dispatch($server); StopSentinel::dispatch($server);
} }
@@ -36,7 +42,7 @@ class Init extends Command
$full_cleanup = $this->option('full-cleanup'); $full_cleanup = $this->option('full-cleanup');
$cleanup_deployments = $this->option('cleanup-deployments'); $cleanup_deployments = $this->option('cleanup-deployments');
$cleanup_proxy_networks = $this->option('cleanup-proxy-networks');
$this->replace_slash_in_environment_name(); $this->replace_slash_in_environment_name();
if ($cleanup_deployments) { if ($cleanup_deployments) {
echo "Running cleanup deployments.\n"; echo "Running cleanup deployments.\n";
@@ -44,17 +50,26 @@ class Init extends Command
return; return;
} }
if ($cleanup_proxy_networks) {
echo "Running cleanup proxy networks.\n";
$this->cleanup_unused_network_from_coolify_proxy();
return;
}
if ($full_cleanup) { if ($full_cleanup) {
// Required for falsely deleted coolify db // Required for falsely deleted coolify db
$this->restore_coolify_db_backup(); $this->restore_coolify_db_backup();
$this->update_traefik_labels();
$this->cleanup_unused_network_from_coolify_proxy();
$this->cleanup_unnecessary_dynamic_proxy_configuration();
$this->cleanup_in_progress_application_deployments(); $this->cleanup_in_progress_application_deployments();
$this->cleanup_stucked_helper_containers(); $this->cleanup_stucked_helper_containers();
$this->call('cleanup:queue'); $this->call('cleanup:queue');
$this->call('cleanup:stucked-resources'); $this->call('cleanup:stucked-resources');
if (! isCloud()) { if (! isCloud()) {
try { try {
$server = Server::find(0)->first(); $localhost = $this->servers->where('id', 0)->first();
$server->setupDynamicProxyConfiguration(); $localhost->setupDynamicProxyConfiguration();
} catch (\Throwable $e) { } catch (\Throwable $e) {
echo "Could not setup dynamic configuration: {$e->getMessage()}\n"; echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
} }
@@ -68,6 +83,13 @@ class Init extends Command
$settings->update(['is_auto_update_enabled' => false]); $settings->update(['is_auto_update_enabled' => false]);
} }
} }
if (isCloud()) {
$response = Http::retry(3, 1000)->get(config('constants.services.official'));
if ($response->successful()) {
$services = $response->json();
File::put(base_path('templates/service-templates.json'), json_encode($services));
}
}
return; return;
} }
@@ -75,6 +97,68 @@ class Init extends Command
$this->call('cleanup:stucked-resources'); $this->call('cleanup:stucked-resources');
} }
private function update_traefik_labels()
{
Server::where('proxy->type', 'TRAEFIK_V2')->update(['proxy->type' => 'TRAEFIK']);
}
private function cleanup_unnecessary_dynamic_proxy_configuration()
{
if (isCloud()) {
foreach ($this->servers as $server) {
if (! $server->isFunctional()) {
continue;
}
if ($server->id === 0) {
continue;
}
$file = $server->proxyPath().'/dynamic/coolify.yaml';
return instant_remote_process([
"rm -f $file",
], $server, false);
}
}
}
private function cleanup_unused_network_from_coolify_proxy()
{
ray()->clearAll();
foreach ($this->servers as $server) {
if (! $server->isFunctional()) {
continue;
}
if (! $server->isProxyShouldRun()) {
continue;
}
['networks' => $networks, 'allNetworks' => $allNetworks] = collectDockerNetworksByServer($server);
$removeNetworks = $allNetworks->diff($networks);
$commands = collect();
foreach ($removeNetworks as $network) {
$out = instant_remote_process(["docker network inspect -f json $network | jq '.[].Containers | if . == {} then null else . end'"], $server, false);
if (empty($out)) {
$commands->push("docker network disconnect $network coolify-proxy >/dev/null 2>&1 || true");
$commands->push("docker network rm $network >/dev/null 2>&1 || true");
} else {
$data = collect(json_decode($out, true));
if ($data->count() === 1) {
// If only coolify-proxy itself is connected to that network (it should not be possible, but who knows)
$isCoolifyProxyItself = data_get($data->first(), 'Name') === 'coolify-proxy';
if ($isCoolifyProxyItself) {
$commands->push("docker network disconnect $network coolify-proxy >/dev/null 2>&1 || true");
$commands->push("docker network rm $network >/dev/null 2>&1 || true");
}
}
}
}
if ($commands->isNotEmpty()) {
echo "Cleaning up unused networks from coolify proxy\n";
remote_process(command: $commands, type: ActivityTypes::INLINE->value, server: $server, ignore_errors: false);
}
}
}
private function restore_coolify_db_backup() private function restore_coolify_db_backup()
{ {
try { try {
@@ -102,8 +186,7 @@ class Init extends Command
private function cleanup_stucked_helper_containers() private function cleanup_stucked_helper_containers()
{ {
$servers = Server::all(); foreach ($this->servers as $server) {
foreach ($servers as $server) {
if ($server->isFunctional()) { if ($server->isFunctional()) {
CleanupHelperContainersJob::dispatch($server); CleanupHelperContainersJob::dispatch($server);
} }

46
app/Console/Kernel.php
View File

@@ -2,9 +2,8 @@
namespace App\Console; namespace App\Console;
use App\Jobs\CheckLogDrainContainerJob; use App\Jobs\CheckForUpdatesJob;
use App\Jobs\CleanupInstanceStuffsJob; use App\Jobs\CleanupInstanceStuffsJob;
use App\Jobs\ContainerStatusJob;
use App\Jobs\DatabaseBackupJob; use App\Jobs\DatabaseBackupJob;
use App\Jobs\DockerCleanupJob; use App\Jobs\DockerCleanupJob;
use App\Jobs\PullCoolifyImageJob; use App\Jobs\PullCoolifyImageJob;
@@ -12,7 +11,9 @@ use App\Jobs\PullHelperImageJob;
use App\Jobs\PullSentinelImageJob; use App\Jobs\PullSentinelImageJob;
use App\Jobs\PullTemplatesFromCDN; use App\Jobs\PullTemplatesFromCDN;
use App\Jobs\ScheduledTaskJob; use App\Jobs\ScheduledTaskJob;
use App\Jobs\ServerStatusJob; use App\Jobs\ServerCheckJob;
use App\Jobs\UpdateCoolifyJob;
use App\Models\InstanceSettings;
use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackup;
use App\Models\ScheduledTask; use App\Models\ScheduledTask;
use App\Models\Server; use App\Models\Server;
@@ -27,25 +28,26 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule): void protected function schedule(Schedule $schedule): void
{ {
$this->all_servers = Server::all(); $this->all_servers = Server::all();
$settings = InstanceSettings::get();
if (isDev()) { if (isDev()) {
// Instance Jobs // Instance Jobs
$schedule->command('horizon:snapshot')->everyMinute(); $schedule->command('horizon:snapshot')->everyMinute();
$schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer(); $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
$schedule->job(new PullTemplatesFromCDN)->everyTwoHours()->onOneServer();
// Server Jobs // Server Jobs
$this->check_scheduled_backups($schedule); $this->check_scheduled_backups($schedule);
$this->check_resources($schedule); $this->check_resources($schedule);
$this->check_scheduled_backups($schedule);
$this->check_scheduled_tasks($schedule); $this->check_scheduled_tasks($schedule);
$schedule->command('uploads:clear')->everyTwoMinutes(); $schedule->command('uploads:clear')->everyTwoMinutes();
} else { } else {
// Instance Jobs // Instance Jobs
$schedule->command('horizon:snapshot')->everyFiveMinutes(); $schedule->command('horizon:snapshot')->everyFiveMinutes();
$schedule->command('cleanup:unreachable-servers')->daily(); $schedule->command('cleanup:unreachable-servers')->daily();
$schedule->job(new PullCoolifyImageJob)->everyTenMinutes()->onOneServer(); $schedule->job(new PullCoolifyImageJob)->cron($settings->update_check_frequency)->onOneServer();
$schedule->job(new PullTemplatesFromCDN)->everyThirtyMinutes()->onOneServer(); $schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
$schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer(); $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
// $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer(); $this->schedule_updates($schedule);
// Server Jobs // Server Jobs
$this->check_scheduled_backups($schedule); $this->check_scheduled_backups($schedule);
@@ -60,12 +62,26 @@ class Kernel extends ConsoleKernel
private function pull_images($schedule) private function pull_images($schedule)
{ {
$settings = InstanceSettings::get();
$servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4'); $servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
foreach ($servers as $server) { foreach ($servers as $server) {
if ($server->isSentinelEnabled()) { if ($server->isSentinelEnabled()) {
$schedule->job(new PullSentinelImageJob($server))->everyFiveMinutes()->onOneServer(); $schedule->job(new PullSentinelImageJob($server))->cron($settings->update_check_frequency)->onOneServer();
} }
$schedule->job(new PullHelperImageJob($server))->everyFiveMinutes()->onOneServer(); $schedule->job(new PullHelperImageJob($server))->cron($settings->update_check_frequency)->onOneServer();
}
}
private function schedule_updates($schedule)
{
$settings = InstanceSettings::get();
$updateCheckFrequency = $settings->update_check_frequency;
$schedule->job(new CheckForUpdatesJob)->cron($updateCheckFrequency)->onOneServer();
if ($settings->is_auto_update_enabled) {
$autoUpdateFrequency = $settings->auto_update_frequency;
$schedule->job(new UpdateCoolifyJob)->cron($autoUpdateFrequency)->onOneServer();
} }
} }
@@ -75,19 +91,11 @@ class Kernel extends ConsoleKernel
$servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4'); $servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
$own = Team::find(0)->servers; $own = Team::find(0)->servers;
$servers = $servers->merge($own); $servers = $servers->merge($own);
$containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
} else { } else {
$servers = $this->all_servers->where('ip', '!=', '1.2.3.4'); $servers = $this->all_servers->where('ip', '!=', '1.2.3.4');
$containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
}
foreach ($containerServers as $server) {
$schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
if ($server->isLogDrainEnabled()) {
$schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
}
} }
foreach ($servers as $server) { foreach ($servers as $server) {
$schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer(); $schedule->job(new ServerCheckJob($server))->everyMinute()->onOneServer();
$schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer(); $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
} }
} }

2
app/Enums/ProxyTypes.php
View File

@@ -5,7 +5,7 @@ namespace App\Enums;
enum ProxyTypes: string enum ProxyTypes: string
{ {
case NONE = 'NONE'; case NONE = 'NONE';
case TRAEFIK_V2 = 'TRAEFIK_V2'; case TRAEFIK = 'TRAEFIK';
case NGINX = 'NGINX'; case NGINX = 'NGINX';
case CADDY = 'CADDY'; case CADDY = 'CADDY';
} }

32
app/Events/FileStorageChanged.php Normal file
View File

@@ -0,0 +1,32 @@
<?php
namespace App\Events;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Broadcasting\PrivateChannel;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
class FileStorageChanged implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $teamId;
public function __construct($teamId = null)
{
ray($teamId);
if (is_null($teamId)) {
throw new \Exception('Team id is null');
}
$this->teamId = $teamId;
}
public function broadcastOn(): array
{
return [
new PrivateChannel("team.{$this->teamId}"),
];
}
}

2
app/Http/Controllers/Api/ServersController.php
View File

@@ -525,7 +525,7 @@ class ServersController extends Controller
'private_key_id' => $privateKey->id, 'private_key_id' => $privateKey->id,
'team_id' => $teamId, 'team_id' => $teamId,
'proxy' => [ 'proxy' => [
'type' => ProxyTypes::TRAEFIK_V2->value, 'type' => ProxyTypes::TRAEFIK->value,
'status' => ProxyStatus::EXITED->value, 'status' => ProxyStatus::EXITED->value,
], ],
]); ]);

2
app/Http/Controllers/Api/ServicesController.php
View File

@@ -413,6 +413,8 @@ class ServicesController extends Controller
return response()->json(['message' => 'Service not found.'], 404); return response()->json(['message' => 'Service not found.'], 404);
} }
$service = $service->load(['applications', 'databases']);
return response()->json($this->removeSensitiveData($service)); return response()->json($this->removeSensitiveData($service));
} }

67
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -871,8 +871,10 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
$envs->push($env->key.'='.$real_value); $envs->push($env->key.'='.$real_value);
} }
// Add PORT if not exists, use the first port as default // Add PORT if not exists, use the first port as default
if ($this->application->environment_variables_preview->where('key', 'PORT')->isEmpty()) { if ($this->build_pack !== 'dockercompose') {
$envs->push("PORT={$ports[0]}"); if ($this->application->environment_variables_preview->where('key', 'PORT')->isEmpty()) {
$envs->push("PORT={$ports[0]}");
}
} }
// Add HOST if not exists // Add HOST if not exists
if ($this->application->environment_variables_preview->where('key', 'HOST')->isEmpty()) { if ($this->application->environment_variables_preview->where('key', 'HOST')->isEmpty()) {
@@ -915,15 +917,16 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
$envs->push($env->key.'='.$real_value); $envs->push($env->key.'='.$real_value);
} }
// Add PORT if not exists, use the first port as default // Add PORT if not exists, use the first port as default
if ($this->application->environment_variables->where('key', 'PORT')->isEmpty()) { if ($this->build_pack !== 'dockercompose') {
$envs->push("PORT={$ports[0]}"); if ($this->application->environment_variables->where('key', 'PORT')->isEmpty()) {
$envs->push("PORT={$ports[0]}");
}
} }
// Add HOST if not exists // Add HOST if not exists
if ($this->application->environment_variables->where('key', 'HOST')->isEmpty()) { if ($this->application->environment_variables->where('key', 'HOST')->isEmpty()) {
$envs->push('HOST=0.0.0.0'); $envs->push('HOST=0.0.0.0');
} }
} }
if ($envs->isEmpty()) { if ($envs->isEmpty()) {
$this->env_filename = null; $this->env_filename = null;
if ($this->use_build_server) { if ($this->use_build_server) {
@@ -1022,7 +1025,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
$this->write_deployment_configurations(); $this->write_deployment_configurations();
$this->server = $this->original_server; $this->server = $this->original_server;
} }
if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || isset($this->application->settings->custom_internal_name) || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) { if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty() || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
$this->application_deployment_queue->addLogEntry('----------------------------------------'); $this->application_deployment_queue->addLogEntry('----------------------------------------');
if (count($this->application->ports_mappings_array) > 0) { if (count($this->application->ports_mappings_array) > 0) {
$this->application_deployment_queue->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.'); $this->application_deployment_queue->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.');
@@ -2024,27 +2027,43 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
$this->application_deployment_queue->addLogEntry('Building docker image completed.'); $this->application_deployment_queue->addLogEntry('Building docker image completed.');
} }
/**
* @param int $timeout in seconds
*/
private function graceful_shutdown_container(string $containerName, int $timeout = 30)
{
try {
$this->execute_remote_command(
["docker stop --time=$timeout $containerName", 'hidden' => true, 'ignore_errors' => true],
["docker rm $containerName", 'hidden' => true, 'ignore_errors' => true]
);
} catch (\Exception $error) {
// report error if needed
}
$this->execute_remote_command(
["docker rm -f $containerName", 'hidden' => true, 'ignore_errors' => true]
);
}
private function stop_running_container(bool $force = false) private function stop_running_container(bool $force = false)
{ {
$this->application_deployment_queue->addLogEntry('Removing old containers.'); $this->application_deployment_queue->addLogEntry('Removing old containers.');
if ($this->newVersionIsHealthy || $force) { if ($this->newVersionIsHealthy || $force) {
$containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id); if ($this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty()) {
if ($this->pull_request_id === 0) { $this->graceful_shutdown_container($this->container_name);
$containers = $containers->filter(function ($container) { } else {
return data_get($container, 'Names') !== $this->container_name && data_get($container, 'Names') !== $this->container_name.'-pr-'.$this->pull_request_id; $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
if ($this->pull_request_id === 0) {
$containers = $containers->filter(function ($container) {
return data_get($container, 'Names') !== $this->container_name && data_get($container, 'Names') !== $this->container_name.'-pr-'.$this->pull_request_id;
});
}
$containers->each(function ($container) {
$this->graceful_shutdown_container(data_get($container, 'Names'));
}); });
} }
$containers->each(function ($container) {
$containerName = data_get($container, 'Names');
$this->execute_remote_command(
["docker rm -f $containerName >/dev/null 2>&1", 'hidden' => true, 'ignore_errors' => true],
);
});
if ($this->application->settings->is_consistent_container_name_enabled || isset($this->application->settings->custom_internal_name)) {
$this->execute_remote_command(
["docker rm -f $this->container_name >/dev/null 2>&1", 'hidden' => true, 'ignore_errors' => true],
);
}
} else { } else {
if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') { if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
$this->application_deployment_queue->addLogEntry('----------------------------------------'); $this->application_deployment_queue->addLogEntry('----------------------------------------');
@@ -2055,9 +2074,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
$this->application_deployment_queue->update([ $this->application_deployment_queue->update([
'status' => ApplicationDeploymentStatus::FAILED->value, 'status' => ApplicationDeploymentStatus::FAILED->value,
]); ]);
$this->execute_remote_command( $this->graceful_shutdown_container($this->container_name);
["docker rm -f $this->container_name >/dev/null 2>&1", 'hidden' => true, 'ignore_errors' => true],
);
} }
} }
@@ -2232,7 +2249,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
ray($code); ray($code);
if ($code !== 69420) { if ($code !== 69420) {
// 69420 means failed to push the image to the registry, so we don't need to remove the new version as it is the currently running one // 69420 means failed to push the image to the registry, so we don't need to remove the new version as it is the currently running one
if ($this->application->settings->is_consistent_container_name_enabled || isset($this->application->settings->custom_internal_name)) { if ($this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty()) {
// do not remove already running container // do not remove already running container
} else { } else {
$this->application_deployment_queue->addLogEntry('Deployment failed. Removing the new version of your application.', 'stderr'); $this->application_deployment_queue->addLogEntry('Deployment failed. Removing the new version of your application.', 'stderr');

42
app/Jobs/CheckForUpdatesJob.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
namespace App\Jobs;
use App\Models\InstanceSettings;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Http;
class CheckForUpdatesJob implements ShouldBeEncrypted, ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public function handle(): void
{
try {
if (isDev() || isCloud()) {
return;
}
$settings = InstanceSettings::get();
$response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json');
if ($response->successful()) {
$versions = $response->json();
$latest_version = data_get($versions, 'coolify.v4.version');
$current_version = config('version');
if (version_compare($latest_version, $current_version, '>')) {
// New version available
$settings->update(['new_version_available' => true]);
} else {
$settings->update(['new_version_available' => false]);
}
}
} catch (\Throwable $e) {
// Consider implementing a notification to administrators
}
}
}

17
app/Jobs/DockerCleanupJob.php
View File

@@ -26,17 +26,6 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
public function handle(): void public function handle(): void
{ {
try { try {
// $isInprogress = false;
// $this->server->applications()->each(function ($application) use (&$isInprogress) {
// if ($application->isDeploymentInprogress()) {
// $isInprogress = true;
// return;
// }
// });
// if ($isInprogress) {
// throw new RuntimeException('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
// }
if (! $this->server->isFunctional()) { if (! $this->server->isFunctional()) {
return; return;
} }
@@ -48,6 +37,12 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
} }
$this->usageBefore = $this->server->getDiskUsage(); $this->usageBefore = $this->server->getDiskUsage();
if (str($this->usageBefore)->isEmpty() || $this->usageBefore === null || $this->usageBefore === 0) {
Log::info('DockerCleanupJob force cleanup on '.$this->server->name);
CleanupDocker::run(server: $this->server, force: true);
return;
}
if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) { if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
CleanupDocker::run(server: $this->server, force: false); CleanupDocker::run(server: $this->server, force: false);
$usageAfter = $this->server->getDiskUsage(); $usageAfter = $this->server->getDiskUsage();

11
app/Jobs/PullCoolifyImageJob.php
View File

@@ -2,6 +2,7 @@
namespace App\Jobs; namespace App\Jobs;
use App\Models\InstanceSettings;
use App\Models\Server; use App\Models\Server;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -16,16 +17,13 @@ class PullCoolifyImageJob implements ShouldBeEncrypted, ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $timeout = 1000;
public function __construct() {}
public function handle(): void public function handle(): void
{ {
try { try {
if (isDev() || isCloud()) { if (isDev() || isCloud()) {
return; return;
} }
$settings = InstanceSettings::get();
$server = Server::findOrFail(0); $server = Server::findOrFail(0);
$response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json'); $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json');
if ($response->successful()) { if ($response->successful()) {
@@ -35,7 +33,6 @@ class PullCoolifyImageJob implements ShouldBeEncrypted, ShouldQueue
$latest_version = get_latest_version_of_coolify(); $latest_version = get_latest_version_of_coolify();
instant_remote_process(["docker pull -q ghcr.io/coollabsio/coolify:{$latest_version}"], $server, false); instant_remote_process(["docker pull -q ghcr.io/coollabsio/coolify:{$latest_version}"], $server, false);
$settings = \App\Models\InstanceSettings::get();
$current_version = config('version'); $current_version = config('version');
if (! $settings->is_auto_update_enabled) { if (! $settings->is_auto_update_enabled) {
return; return;
@@ -46,10 +43,6 @@ class PullCoolifyImageJob implements ShouldBeEncrypted, ShouldQueue
if (version_compare($latest_version, $current_version, '<')) { if (version_compare($latest_version, $current_version, '<')) {
return; return;
} }
instant_remote_process([
'curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh',
"bash /data/coolify/source/upgrade.sh $latest_version",
], $server);
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw $e; throw $e;
} }

19
app/Jobs/PullTemplatesFromCDN.php
View File

@@ -22,15 +22,16 @@ class PullTemplatesFromCDN implements ShouldBeEncrypted, ShouldQueue
public function handle(): void public function handle(): void
{ {
try { try {
if (! isDev()) { if (isDev() || isCloud()) {
ray('PullTemplatesAndVersions service-templates'); return;
$response = Http::retry(3, 1000)->get(config('constants.services.official')); }
if ($response->successful()) { ray('PullTemplatesAndVersions service-templates');
$services = $response->json(); $response = Http::retry(3, 1000)->get(config('constants.services.official'));
File::put(base_path('templates/service-templates.json'), json_encode($services)); if ($response->successful()) {
} else { $services = $response->json();
send_internal_notification('PullTemplatesAndVersions failed with: '.$response->status().' '.$response->body()); File::put(base_path('templates/service-templates.json'), json_encode($services));
} } else {
send_internal_notification('PullTemplatesAndVersions failed with: '.$response->status().' '.$response->body());
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
send_internal_notification('PullTemplatesAndVersions failed with: '.$e->getMessage()); send_internal_notification('PullTemplatesAndVersions failed with: '.$e->getMessage());

93
app/Jobs/ServerCheckJob.php
View File

@@ -3,6 +3,7 @@
namespace App\Jobs; namespace App\Jobs;
use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StartDatabaseProxy;
use App\Actions\Docker\GetContainersStatus;
use App\Actions\Proxy\CheckProxy; use App\Actions\Proxy\CheckProxy;
use App\Actions\Proxy\StartProxy; use App\Actions\Proxy\StartProxy;
use App\Actions\Server\InstallLogDrain; use App\Actions\Server\InstallLogDrain;
@@ -15,7 +16,6 @@ use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
@@ -42,20 +42,24 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
public function __construct(public Server $server) {} public function __construct(public Server $server) {}
public function middleware(): array // public function middleware(): array
{ // {
return [(new WithoutOverlapping($this->server->uuid))]; // return [(new WithoutOverlapping($this->server->uuid))];
} // }
public function uniqueId(): int // public function uniqueId(): int
{ // {
return $this->server->uuid; // return $this->server->uuid;
} // }
public function handle() public function handle()
{ {
try { try {
$this->applications = $this->server->applications();
$this->databases = $this->server->databases();
$this->services = $this->server->services()->get();
$this->previews = $this->server->previews();
$up = $this->serverStatus(); $up = $this->serverStatus();
if (! $up) { if (! $up) {
ray('Server is not reachable.'); ray('Server is not reachable.');
@@ -67,14 +71,15 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
return 'Server is not ready.'; return 'Server is not ready.';
} }
$this->checkSentinel(); if (! $this->server->isSwarmWorker() && ! $this->server->isBuildServer()) {
$this->getContainers(); ['containers' => $this->containers, 'containerReplicates' => $containerReplicates] = $this->server->getContainers();
if (is_null($this->containers)) {
if (is_null($this->containers)) { return 'No containers found.';
return 'No containers found.'; }
GetContainersStatus::run($this->server, $this->containers, $containerReplicates);
$this->checkLogDrainContainer();
$this->checkSentinel();
} }
$this->checkLogDrainContainer();
$this->containerStatus();
} catch (\Throwable $e) { } catch (\Throwable $e) {
ray($e->getMessage()); ray($e->getMessage());
@@ -101,13 +106,13 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
private function serverStatus() private function serverStatus()
{ {
$this->removeUnnevessaryCoolifyYaml();
['uptime' => $uptime] = $this->server->validateConnection(); ['uptime' => $uptime] = $this->server->validateConnection();
if ($uptime) { if ($uptime) {
if ($this->server->unreachable_notification_sent === true) { if ($this->server->unreachable_notification_sent === true) {
$this->server->update(['unreachable_notification_sent' => false]); $this->server->update(['unreachable_notification_sent' => false]);
} }
} else { } else {
// $this->server->team?->notify(new Unreachable($this->server));
foreach ($this->applications as $application) { foreach ($this->applications as $application) {
$application->update(['status' => 'exited']); $application->update(['status' => 'exited']);
} }
@@ -132,18 +137,6 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
} }
private function removeUnnevessaryCoolifyYaml()
{
// This will remote the coolify.yaml file from the server as it is not needed on cloud servers
if (isCloud() && $this->server->id !== 0) {
$file = $this->server->proxyPath().'/dynamic/coolify.yaml';
return instant_remote_process([
"rm -f $file",
], $this->server, false);
}
}
private function checkLogDrainContainer() private function checkLogDrainContainer()
{ {
$foundLogDrainContainer = $this->containers->filter(function ($value, $key) { $foundLogDrainContainer = $this->containers->filter(function ($value, $key) {
@@ -159,49 +152,9 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
} }
} }
private function getContainers()
{
if ($this->server->isSwarm()) {
$this->containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
$this->containers = format_docker_command_output_to_json($this->containers);
$containerReplicates = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
if ($containerReplicates) {
$containerReplicates = format_docker_command_output_to_json($containerReplicates);
foreach ($containerReplicates as $containerReplica) {
$name = data_get($containerReplica, 'Name');
$this->containers = $this->containers->map(function ($container) use ($name, $containerReplica) {
if (data_get($container, 'Spec.Name') === $name) {
$replicas = data_get($containerReplica, 'Replicas');
$running = str($replicas)->explode('/')[0];
$total = str($replicas)->explode('/')[1];
if ($running === $total) {
data_set($container, 'State.Status', 'running');
data_set($container, 'State.Health.Status', 'healthy');
} else {
data_set($container, 'State.Status', 'starting');
data_set($container, 'State.Health.Status', 'unhealthy');
}
}
return $container;
});
}
}
} else {
$this->containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server, false);
$this->containers = format_docker_command_output_to_json($this->containers);
}
}
private function containerStatus() private function containerStatus()
{ {
$this->applications = $this->server->applications();
$this->databases = $this->server->databases();
$this->services = $this->server->services()->get();
$this->previews = $this->server->previews();
$foundApplications = []; $foundApplications = [];
$foundApplicationPreviews = []; $foundApplicationPreviews = [];
$foundDatabases = []; $foundDatabases = [];

51
app/Jobs/UpdateCoolifyJob.php Normal file
View File

@@ -0,0 +1,51 @@
<?php
namespace App\Jobs;
use App\Actions\Server\UpdateCoolify;
use App\Models\InstanceSettings;
use App\Models\Server;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $timeout = 600;
public function handle(): void
{
try {
CheckForUpdatesJob::dispatchSync();
$settings = InstanceSettings::get();
if (! $settings->new_version_available) {
Log::info('No new version available. Skipping update.');
return;
}
$server = Server::findOrFail(0);
if (! $server) {
Log::error('Server not found. Cannot proceed with update.');
return;
}
Log::info('Starting Coolify update process...');
UpdateCoolify::run(false); // false means it's not a manual update
$settings->update(['new_version_available' => false]);
Log::info('Coolify update completed successfully.');
} catch (\Throwable $e) {
Log::error('UpdateCoolifyJob failed: '.$e->getMessage());
// Consider implementing a notification to administrators
}
}
}

2
app/Livewire/Boarding/Index.php
View File

@@ -179,7 +179,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
public function getProxyType() public function getProxyType()
{ {
// Set Default Proxy Type // Set Default Proxy Type
$this->selectProxy(ProxyTypes::TRAEFIK_V2->value); $this->selectProxy(ProxyTypes::TRAEFIK->value);
// $proxyTypeSet = $this->createdServer->proxy->type; // $proxyTypeSet = $this->createdServer->proxy->type;
// if (!$proxyTypeSet) { // if (!$proxyTypeSet) {
// $this->currentState = 'select-proxy'; // $this->currentState = 'select-proxy';

35
app/Livewire/NavbarDeleteTeam.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
namespace App\Livewire;
use Illuminate\Support\Facades\DB;
use Livewire\Component;
class NavbarDeleteTeam extends Component
{
public function delete()
{
$currentTeam = currentTeam();
$currentTeam->delete();
$currentTeam->members->each(function ($user) use ($currentTeam) {
if ($user->id === auth()->user()->id) {
return;
}
$user->teams()->detach($currentTeam);
$session = DB::table('sessions')->where('user_id', $user->id)->first();
if ($session) {
DB::table('sessions')->where('id', $session->id)->delete();
}
});
refreshSession();
return redirect()->route('team.index');
}
public function render()
{
return view('livewire.navbar-delete-team');
}
}

2
app/Livewire/Project/Application/Advanced.php
View File

@@ -91,7 +91,7 @@ class Advanced extends Component
public function saveCustomName() public function saveCustomName()
{ {
if (isset($this->application->settings->custom_internal_name)) { if (str($this->application->settings->custom_internal_name)->isNotEmpty()) {
$this->application->settings->custom_internal_name = str($this->application->settings->custom_internal_name)->slug()->value(); $this->application->settings->custom_internal_name = str($this->application->settings->custom_internal_name)->slug()->value();
} else { } else {
$this->application->settings->custom_internal_name = null; $this->application->settings->custom_internal_name = null;

2
app/Livewire/Project/Application/General.php
View File

@@ -214,7 +214,7 @@ class General extends Component
} }
$this->dispatch('success', 'Docker compose file loaded.'); $this->dispatch('success', 'Docker compose file loaded.');
$this->dispatch('compose_loaded'); $this->dispatch('compose_loaded');
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
$this->dispatch('refreshEnvs'); $this->dispatch('refreshEnvs');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$this->application->docker_compose_location = $this->initialDockerComposeLocation; $this->application->docker_compose_location = $this->initialDockerComposeLocation;

6
app/Livewire/Project/Application/Heading.php
View File

@@ -5,8 +5,6 @@ namespace App\Livewire\Project\Application;
use App\Actions\Application\StopApplication; use App\Actions\Application\StopApplication;
use App\Actions\Docker\GetContainersStatus; use App\Actions\Docker\GetContainersStatus;
use App\Events\ApplicationStatusChanged; use App\Events\ApplicationStatusChanged;
use App\Jobs\ContainerStatusJob;
use App\Jobs\ServerStatusJob;
use App\Models\Application; use App\Models\Application;
use Livewire\Component; use Livewire\Component;
use Visus\Cuid2\Cuid2; use Visus\Cuid2\Cuid2;
@@ -46,11 +44,7 @@ class Heading extends Component
{ {
if ($this->application->destination->server->isFunctional()) { if ($this->application->destination->server->isFunctional()) {
GetContainersStatus::dispatch($this->application->destination->server)->onQueue('high'); GetContainersStatus::dispatch($this->application->destination->server)->onQueue('high');
// dispatch(new ContainerStatusJob($this->application->destination->server));
} else {
dispatch(new ServerStatusJob($this->application->destination->server));
} }
if ($showNotification) { if ($showNotification) {
$this->dispatch('success', 'Success', 'Application status updated.'); $this->dispatch('success', 'Success', 'Application status updated.');
} }

4
app/Livewire/Project/Service/Configuration.php
View File

@@ -25,7 +25,6 @@ class Configuration extends Component
return [ return [
"echo-private:user.{$userId},ServiceStatusChanged" => 'check_status', "echo-private:user.{$userId},ServiceStatusChanged" => 'check_status',
'check_status', 'check_status',
'refresh' => '$refresh',
]; ];
} }
@@ -76,8 +75,7 @@ class Configuration extends Component
{ {
try { try {
GetContainersStatus::run($this->service->server); GetContainersStatus::run($this->service->server);
// dispatch_sync(new ContainerStatusJob($this->service->server)); $this->dispatch('$refresh');
$this->dispatch('refresh')->self();
} catch (\Exception $e) { } catch (\Exception $e) {
return handleError($e, $this); return handleError($e, $this);
} }

19
app/Livewire/Project/Service/FileStorage.php
View File

@@ -26,6 +26,8 @@ class FileStorage extends Component
public ?string $workdir = null; public ?string $workdir = null;
public bool $permanently_delete = true;
protected $rules = [ protected $rules = [
'fileStorage.is_directory' => 'required', 'fileStorage.is_directory' => 'required',
'fileStorage.fs_path' => 'required', 'fileStorage.fs_path' => 'required',
@@ -56,7 +58,7 @@ class FileStorage extends Component
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} finally { } finally {
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
} }
} }
@@ -71,20 +73,27 @@ class FileStorage extends Component
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} finally { } finally {
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
} }
} }
public function delete() public function delete()
{ {
try { try {
$this->fileStorage->deleteStorageOnServer(); $message = 'File deleted.';
if ($this->fileStorage->is_directory) {
$message = 'Directory deleted.';
}
if ($this->permanently_delete) {
$message = 'Directory deleted from the server.';
$this->fileStorage->deleteStorageOnServer();
}
$this->fileStorage->delete(); $this->fileStorage->delete();
$this->dispatch('success', 'File deleted.'); $this->dispatch('success', $message);
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} finally { } finally {
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
} }
} }

5
app/Livewire/Project/Service/Navbar.php
View File

@@ -49,6 +49,11 @@ class Navbar extends Component
} }
} }
public function check_status_without_notification()
{
$this->dispatch('check_status');
}
public function check_status() public function check_status()
{ {
$this->dispatch('check_status'); $this->dispatch('check_status');

26
app/Livewire/Project/Service/Storage.php
View File

@@ -9,14 +9,36 @@ class Storage extends Component
{ {
public $resource; public $resource;
public $fileStorage;
public function getListeners() public function getListeners()
{ {
$teamId = auth()->user()->currentTeam()->id;
return [ return [
"echo-private:team.{$teamId},FileStorageChanged" => 'refreshStoragesFromEvent',
'refreshStorages',
'addNewVolume', 'addNewVolume',
'refresh_storages' => '$refresh',
]; ];
} }
public function mount()
{
$this->refreshStorages();
}
public function refreshStoragesFromEvent()
{
$this->refreshStorages();
$this->dispatch('warning', 'File storage changed. Usually it means that the file / directory is already defined on the server, so Coolify set it up for you properly on the UI.');
}
public function refreshStorages()
{
$this->fileStorage = $this->resource->fileStorages()->get();
$this->dispatch('$refresh');
}
public function addNewVolume($data) public function addNewVolume($data)
{ {
try { try {
@@ -30,7 +52,7 @@ class Storage extends Component
$this->resource->refresh(); $this->resource->refresh();
$this->dispatch('success', 'Storage added successfully'); $this->dispatch('success', 'Storage added successfully');
$this->dispatch('clearAddStorage'); $this->dispatch('clearAddStorage');
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }

10
app/Livewire/Project/Shared/Storages/Add.php
View File

@@ -54,7 +54,11 @@ class Add extends Component
public function mount() public function mount()
{ {
$this->file_storage_directory_source = application_configuration_dir()."/{$this->resource->uuid}"; if (str($this->resource->getMorphClass())->contains('Standalone')) {
$this->file_storage_directory_source = database_configuration_dir()."/{$this->resource->uuid}";
} else {
$this->file_storage_directory_source = application_configuration_dir()."/{$this->resource->uuid}";
}
$this->uuid = $this->resource->uuid; $this->uuid = $this->resource->uuid;
$this->parameters = get_route_parameters(); $this->parameters = get_route_parameters();
if (data_get($this->parameters, 'application_uuid')) { if (data_get($this->parameters, 'application_uuid')) {
@@ -92,7 +96,7 @@ class Add extends Component
'resource_type' => get_class($this->resource), 'resource_type' => get_class($this->resource),
], ],
); );
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }
@@ -119,7 +123,7 @@ class Add extends Component
'resource_type' => get_class($this->resource), 'resource_type' => get_class($this->resource),
], ],
); );
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }

2
app/Livewire/Project/Shared/Storages/All.php
View File

@@ -8,5 +8,5 @@ class All extends Component
{ {
public $resource; public $resource;
protected $listeners = ['refresh_storages' => '$refresh']; protected $listeners = ['refreshStorages' => '$refresh'];
} }

2
app/Livewire/Project/Shared/Storages/Show.php
View File

@@ -39,6 +39,6 @@ class Show extends Component
public function delete() public function delete()
{ {
$this->storage->delete(); $this->storage->delete();
$this->dispatch('refresh_storages'); $this->dispatch('refreshStorages');
} }
} }

4
app/Livewire/Server/LogDrains.php
View File

@@ -3,6 +3,7 @@
namespace App\Livewire\Server; namespace App\Livewire\Server;
use App\Actions\Server\InstallLogDrain; use App\Actions\Server\InstallLogDrain;
use App\Actions\Server\StopLogDrain;
use App\Models\Server; use App\Models\Server;
use Livewire\Component; use Livewire\Component;
@@ -132,6 +133,9 @@ class LogDrains extends Component
'is_logdrain_axiom_enabled' => false, 'is_logdrain_axiom_enabled' => false,
]); ]);
} }
if (! $this->server->isLogDrainEnabled()) {
StopLogDrain::dispatch($this->server);
}
$this->server->settings->save(); $this->server->settings->save();
$this->dispatch('success', 'Settings saved.'); $this->dispatch('success', 'Settings saved.');

2
app/Livewire/Server/New/ByIp.php
View File

@@ -104,7 +104,7 @@ class ByIp extends Component
'private_key_id' => $this->private_key_id, 'private_key_id' => $this->private_key_id,
'proxy' => [ 'proxy' => [
// set default proxy type to traefik v2 // set default proxy type to traefik v2
'type' => ProxyTypes::TRAEFIK_V2->value, 'type' => ProxyTypes::TRAEFIK->value,
'status' => ProxyStatus::EXITED->value, 'status' => ProxyStatus::EXITED->value,
], ],
]; ];

19
app/Livewire/Server/Proxy.php
View File

@@ -20,6 +20,10 @@ class Proxy extends Component
protected $listeners = ['proxyStatusUpdated', 'saveConfiguration' => 'submit']; protected $listeners = ['proxyStatusUpdated', 'saveConfiguration' => 'submit'];
protected $rules = [
'server.settings.generate_exact_labels' => 'required|boolean',
];
public function mount() public function mount()
{ {
$this->selectedProxy = $this->server->proxyType(); $this->selectedProxy = $this->server->proxyType();
@@ -31,13 +35,13 @@ class Proxy extends Component
$this->dispatch('refresh')->self(); $this->dispatch('refresh')->self();
} }
public function change_proxy() public function changeProxy()
{ {
$this->server->proxy = null; $this->server->proxy = null;
$this->server->save(); $this->server->save();
} }
public function select_proxy($proxy_type) public function selectProxy($proxy_type)
{ {
$this->server->proxy->set('status', 'exited'); $this->server->proxy->set('status', 'exited');
$this->server->proxy->set('type', $proxy_type); $this->server->proxy->set('type', $proxy_type);
@@ -49,6 +53,17 @@ class Proxy extends Component
$this->dispatch('proxyStatusUpdated'); $this->dispatch('proxyStatusUpdated');
} }
public function instantSave()
{
try {
$this->validate();
$this->server->settings->save();
$this->dispatch('success', 'Settings saved.');
} catch (\Throwable $e) {
return handleError($e, $this);
}
}
public function submit() public function submit()
{ {
try { try {

3
app/Livewire/Server/Proxy/DynamicConfigurations.php
View File

@@ -21,7 +21,6 @@ class DynamicConfigurations extends Component
return [ return [
"echo-private:team.{$teamId},ProxyStatusChanged" => 'loadDynamicConfigurations', "echo-private:team.{$teamId},ProxyStatusChanged" => 'loadDynamicConfigurations',
'loadDynamicConfigurations', 'loadDynamicConfigurations',
'refresh' => '$refresh',
]; ];
} }
@@ -42,7 +41,7 @@ class DynamicConfigurations extends Component
$contents[$without_extension] = instant_remote_process(["cat {$proxy_path}/dynamic/{$file}"], $this->server); $contents[$without_extension] = instant_remote_process(["cat {$proxy_path}/dynamic/{$file}"], $this->server);
} }
$this->contents = $contents; $this->contents = $contents;
$this->dispatch('refresh'); $this->dispatch('$refresh');
} }
public function mount() public function mount()

5
app/Livewire/Server/Proxy/NewDynamicConfiguration.php
View File

@@ -2,6 +2,7 @@
namespace App\Livewire\Server\Proxy; namespace App\Livewire\Server\Proxy;
use App\Enums\ProxyTypes;
use App\Models\Server; use App\Models\Server;
use Livewire\Component; use Livewire\Component;
use Symfony\Component\Yaml\Yaml; use Symfony\Component\Yaml\Yaml;
@@ -45,7 +46,7 @@ class NewDynamicConfiguration extends Component
return redirect()->route('server.index'); return redirect()->route('server.index');
} }
$proxy_type = $this->server->proxyType(); $proxy_type = $this->server->proxyType();
if ($proxy_type === 'TRAEFIK_V2') { if ($proxy_type === ProxyTypes::TRAEFIK->value) {
if (! str($this->fileName)->endsWith('.yaml') && ! str($this->fileName)->endsWith('.yml')) { if (! str($this->fileName)->endsWith('.yaml') && ! str($this->fileName)->endsWith('.yml')) {
$this->fileName = "{$this->fileName}.yaml"; $this->fileName = "{$this->fileName}.yaml";
} }
@@ -69,7 +70,7 @@ class NewDynamicConfiguration extends Component
return; return;
} }
} }
if ($proxy_type === 'TRAEFIK_V2') { if ($proxy_type === ProxyTypes::TRAEFIK->value) {
$yaml = Yaml::parse($this->value); $yaml = Yaml::parse($this->value);
$yaml = Yaml::dump($yaml, 10, 2); $yaml = Yaml::dump($yaml, 10, 2);
$this->value = $yaml; $this->value = $yaml;

111
app/Livewire/Settings/Configuration.php
View File

@@ -1,111 +0,0 @@
<?php
namespace App\Livewire\Settings;
use App\Models\InstanceSettings as ModelsInstanceSettings;
use App\Models\Server;
use Livewire\Component;
class Configuration extends Component
{
public ModelsInstanceSettings $settings;
public bool $do_not_track;
public bool $is_auto_update_enabled;
public bool $is_registration_enabled;
public bool $is_dns_validation_enabled;
public bool $is_api_enabled;
protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
protected Server $server;
protected $rules = [
'settings.fqdn' => 'nullable',
'settings.resale_license' => 'nullable',
'settings.public_port_min' => 'required',
'settings.public_port_max' => 'required',
'settings.custom_dns_servers' => 'nullable',
'settings.instance_name' => 'nullable',
'settings.allowed_ips' => 'nullable',
];
protected $validationAttributes = [
'settings.fqdn' => 'FQDN',
'settings.resale_license' => 'Resale License',
'settings.public_port_min' => 'Public port min',
'settings.public_port_max' => 'Public port max',
'settings.custom_dns_servers' => 'Custom DNS servers',
'settings.allowed_ips' => 'Allowed IPs',
];
public function mount()
{
$this->do_not_track = $this->settings->do_not_track;
$this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;
$this->is_registration_enabled = $this->settings->is_registration_enabled;
$this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled;
$this->is_api_enabled = $this->settings->is_api_enabled;
}
public function instantSave()
{
$this->settings->do_not_track = $this->do_not_track;
$this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
$this->settings->is_registration_enabled = $this->is_registration_enabled;
$this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
$this->settings->is_api_enabled = $this->is_api_enabled;
$this->settings->save();
$this->dispatch('success', 'Settings updated!');
}
public function submit()
{
try {
$error_show = false;
$this->server = Server::findOrFail(0);
$this->resetErrorBag();
if ($this->settings->public_port_min > $this->settings->public_port_max) {
$this->addError('settings.public_port_min', 'The minimum port must be lower than the maximum port.');
return;
}
$this->validate();
if ($this->settings->is_dns_validation_enabled && $this->settings->fqdn) {
if (! validate_dns_entry($this->settings->fqdn, $this->server)) {
$this->dispatch('error', "Validating DNS failed.<br><br>Make sure you have added the DNS records correctly.<br><br>{$this->settings->fqdn}->{$this->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
$error_show = true;
}
}
if ($this->settings->fqdn) {
check_domain_usage(domain: $this->settings->fqdn);
}
$this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->replaceEnd(',', '')->trim();
$this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->trim()->explode(',')->map(function ($dns) {
return str($dns)->trim()->lower();
});
$this->settings->custom_dns_servers = $this->settings->custom_dns_servers->unique();
$this->settings->custom_dns_servers = $this->settings->custom_dns_servers->implode(',');
$this->settings->allowed_ips = str($this->settings->allowed_ips)->replaceEnd(',', '')->trim();
$this->settings->allowed_ips = str($this->settings->allowed_ips)->trim()->explode(',')->map(function ($ip) {
return str($ip)->trim();
});
$this->settings->allowed_ips = $this->settings->allowed_ips->unique();
$this->settings->allowed_ips = $this->settings->allowed_ips->implode(',');
$this->settings->save();
$this->server->setupDynamicProxyConfiguration();
if (! $error_show) {
$this->dispatch('success', 'Instance settings updated successfully!');
}
} catch (\Exception $e) {
return handleError($e, $this);
}
}
}

163
app/Livewire/Settings/Index.php
View File

@@ -2,39 +2,170 @@
namespace App\Livewire\Settings; namespace App\Livewire\Settings;
use App\Jobs\CheckForUpdatesJob;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\S3Storage; use App\Models\Server;
use App\Models\StandalonePostgresql;
use Livewire\Component; use Livewire\Component;
class Index extends Component class Index extends Component
{ {
public InstanceSettings $settings; public InstanceSettings $settings;
public StandalonePostgresql $database; public bool $do_not_track;
public $s3s; public bool $is_auto_update_enabled;
public bool $is_registration_enabled;
public bool $is_dns_validation_enabled;
public bool $is_api_enabled;
public string $auto_update_frequency;
public string $update_check_frequency;
protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
protected Server $server;
protected $rules = [
'settings.fqdn' => 'nullable',
'settings.resale_license' => 'nullable',
'settings.public_port_min' => 'required',
'settings.public_port_max' => 'required',
'settings.custom_dns_servers' => 'nullable',
'settings.instance_name' => 'nullable',
'settings.allowed_ips' => 'nullable',
'settings.is_auto_update_enabled' => 'boolean',
'auto_update_frequency' => 'string',
'update_check_frequency' => 'string',
];
protected $validationAttributes = [
'settings.fqdn' => 'FQDN',
'settings.resale_license' => 'Resale License',
'settings.public_port_min' => 'Public port min',
'settings.public_port_max' => 'Public port max',
'settings.custom_dns_servers' => 'Custom DNS servers',
'settings.allowed_ips' => 'Allowed IPs',
'settings.is_auto_update_enabled' => 'Auto Update Enabled',
'auto_update_frequency' => 'Auto Update Frequency',
'update_check_frequency' => 'Update Check Frequency',
];
public function mount() public function mount()
{ {
if (isInstanceAdmin()) { if (isInstanceAdmin()) {
$settings = \App\Models\InstanceSettings::get(); $this->settings = InstanceSettings::get();
$database = StandalonePostgresql::whereName('coolify-db')->first(); $this->do_not_track = $this->settings->do_not_track;
$s3s = S3Storage::whereTeamId(0)->get() ?? []; $this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;
if ($database) { $this->is_registration_enabled = $this->settings->is_registration_enabled;
if ($database->status !== 'running') { $this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled;
$database->status = 'running'; $this->is_api_enabled = $this->settings->is_api_enabled;
$database->save(); $this->auto_update_frequency = $this->settings->auto_update_frequency;
} $this->update_check_frequency = $this->settings->update_check_frequency;
$this->database = $database;
}
$this->settings = $settings;
$this->s3s = $s3s;
} else { } else {
return redirect()->route('dashboard'); return redirect()->route('dashboard');
} }
} }
public function instantSave()
{
$this->settings->do_not_track = $this->do_not_track;
$this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
$this->settings->is_registration_enabled = $this->is_registration_enabled;
$this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
$this->settings->is_api_enabled = $this->is_api_enabled;
$this->settings->auto_update_frequency = $this->auto_update_frequency;
$this->settings->update_check_frequency = $this->update_check_frequency;
$this->settings->save();
$this->dispatch('success', 'Settings updated!');
}
public function submit()
{
try {
$error_show = false;
$this->server = Server::findOrFail(0);
$this->resetErrorBag();
if ($this->settings->public_port_min > $this->settings->public_port_max) {
$this->addError('settings.public_port_min', 'The minimum port must be lower than the maximum port.');
return;
}
$this->validate();
if ($this->is_auto_update_enabled && ! validate_cron_expression($this->auto_update_frequency)) {
$this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.');
if (empty($this->auto_update_frequency)) {
$this->auto_update_frequency = '0 0 * * *';
}
return;
}
if (! validate_cron_expression($this->update_check_frequency)) {
$this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.');
if (empty($this->update_check_frequency)) {
$this->update_check_frequency = '0 * * * *';
}
return;
}
if ($this->settings->is_dns_validation_enabled && $this->settings->fqdn) {
if (! validate_dns_entry($this->settings->fqdn, $this->server)) {
$this->dispatch('error', "Validating DNS failed.<br><br>Make sure you have added the DNS records correctly.<br><br>{$this->settings->fqdn}->{$this->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
$error_show = true;
}
}
if ($this->settings->fqdn) {
check_domain_usage(domain: $this->settings->fqdn);
}
$this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->replaceEnd(',', '')->trim();
$this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->trim()->explode(',')->map(function ($dns) {
return str($dns)->trim()->lower();
});
$this->settings->custom_dns_servers = $this->settings->custom_dns_servers->unique();
$this->settings->custom_dns_servers = $this->settings->custom_dns_servers->implode(',');
$this->settings->allowed_ips = str($this->settings->allowed_ips)->replaceEnd(',', '')->trim();
$this->settings->allowed_ips = str($this->settings->allowed_ips)->trim()->explode(',')->map(function ($ip) {
return str($ip)->trim();
});
$this->settings->allowed_ips = $this->settings->allowed_ips->unique();
$this->settings->allowed_ips = $this->settings->allowed_ips->implode(',');
$this->settings->do_not_track = $this->do_not_track;
$this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
$this->settings->is_registration_enabled = $this->is_registration_enabled;
$this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
$this->settings->is_api_enabled = $this->is_api_enabled;
$this->settings->auto_update_frequency = $this->auto_update_frequency;
$this->settings->update_check_frequency = $this->update_check_frequency;
$this->settings->save();
$this->server->setupDynamicProxyConfiguration();
if (! $error_show) {
$this->dispatch('success', 'Instance settings updated successfully!');
}
} catch (\Exception $e) {
return handleError($e, $this);
}
}
public function checkManually()
{
CheckForUpdatesJob::dispatchSync();
$this->dispatch('updateAvailable');
$settings = InstanceSettings::get();
if ($settings->new_version_available) {
$this->dispatch('success', 'New version available!');
} else {
$this->dispatch('success', 'No new version available.');
}
}
public function render() public function render()
{ {
return view('livewire.settings.index'); return view('livewire.settings.index');

24
app/Livewire/Settings/Backup.php → app/Livewire/SettingsBackup.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace App\Livewire\Settings; namespace App\Livewire;
use App\Jobs\DatabaseBackupJob; use App\Jobs\DatabaseBackupJob;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
@@ -10,7 +10,7 @@ use App\Models\Server;
use App\Models\StandalonePostgresql; use App\Models\StandalonePostgresql;
use Livewire\Component; use Livewire\Component;
class Backup extends Component class SettingsBackup extends Component
{ {
public InstanceSettings $settings; public InstanceSettings $settings;
@@ -41,8 +41,24 @@ class Backup extends Component
public function mount() public function mount()
{ {
$this->backup = $this->database?->scheduledBackups->first() ?? null; if (isInstanceAdmin()) {
$this->executions = $this->backup?->executions ?? []; $settings = InstanceSettings::get();
$database = StandalonePostgresql::whereName('coolify-db')->first();
$s3s = S3Storage::whereTeamId(0)->get() ?? [];
if ($database) {
if ($database->status !== 'running') {
$database->status = 'running';
$database->save();
}
$this->database = $database;
}
$this->settings = $settings;
$this->s3s = $s3s;
$this->backup = $this->database?->scheduledBackups?->first() ?? null;
$this->executions = $this->backup?->executions ?? [];
} else {
return redirect()->route('dashboard');
}
} }
public function add_coolify_database() public function add_coolify_database()

12
app/Livewire/Settings/Email.php → app/Livewire/SettingsEmail.php
View File

@@ -1,12 +1,12 @@
<?php <?php
namespace App\Livewire\Settings; namespace App\Livewire;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Notifications\TransactionalEmails\Test; use App\Notifications\TransactionalEmails\Test;
use Livewire\Component; use Livewire\Component;
class Email extends Component class SettingsEmail extends Component
{ {
public InstanceSettings $settings; public InstanceSettings $settings;
@@ -42,7 +42,13 @@ class Email extends Component
public function mount() public function mount()
{ {
$this->emails = auth()->user()->email; if (isInstanceAdmin()) {
$this->settings = InstanceSettings::get();
$this->emails = auth()->user()->email;
} else {
return redirect()->route('dashboard');
}
} }
public function submitFromFields() public function submitFromFields()

4
app/Livewire/Settings/Auth.php → app/Livewire/SettingsOauth.php
View File

@@ -1,11 +1,11 @@
<?php <?php
namespace App\Livewire\Settings; namespace App\Livewire;
use App\Models\OauthSetting; use App\Models\OauthSetting;
use Livewire\Component; use Livewire\Component;
class Auth extends Component class SettingsOauth extends Component
{ {
public $oauth_settings_map; public $oauth_settings_map;

21
app/Livewire/Upgrade.php
View File

@@ -3,6 +3,8 @@
namespace App\Livewire; namespace App\Livewire;
use App\Actions\Server\UpdateCoolify; use App\Actions\Server\UpdateCoolify;
use App\Models\InstanceSettings;
use Illuminate\Support\Facades\Http;
use Livewire\Component; use Livewire\Component;
class Upgrade extends Component class Upgrade extends Component
@@ -15,14 +17,23 @@ class Upgrade extends Component
public string $latestVersion = ''; public string $latestVersion = '';
protected $listeners = ['updateAvailable' => 'checkUpdate'];
public function checkUpdate() public function checkUpdate()
{ {
$this->latestVersion = get_latest_version_of_coolify(); try {
$currentVersion = config('version'); $settings = InstanceSettings::get();
version_compare($currentVersion, $this->latestVersion, '<') ? $this->isUpgradeAvailable = true : $this->isUpgradeAvailable = false; $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json');
if (isDev()) { if ($response->successful()) {
$this->isUpgradeAvailable = true; $versions = $response->json();
$this->latestVersion = data_get($versions, 'coolify.v4.version');
}
$this->isUpgradeAvailable = $settings->new_version_available;
} catch (\Throwable $e) {
return handleError($e, $this);
} }
} }
public function upgrade() public function upgrade()

24
app/Models/Application.php
View File

@@ -104,6 +104,8 @@ class Application extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['server_status'];
protected static function booted() protected static function booted()
{ {
static::saving(function ($application) { static::saving(function ($application) {
@@ -466,6 +468,28 @@ class Application extends BaseModel
return $this->getRawOriginal('status'); return $this->getRawOriginal('status');
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
if ($this->additional_servers->count() === 0) {
return $this->destination->server->isFunctional();
} else {
$additional_servers_status = $this->additional_servers->pluck('pivot.status');
$main_server_status = $this->destination->server->isFunctional();
foreach ($additional_servers_status as $status) {
$server_status = str($status)->before(':')->value();
if ($main_server_status !== $server_status) {
return false;
}
}
return true;
}
}
);
}
public function status(): Attribute public function status(): Attribute
{ {
return Attribute::make( return Attribute::make(

3
app/Models/InstanceSettings.php
View File

@@ -18,6 +18,9 @@ class InstanceSettings extends Model implements SendsEmail
'resale_license' => 'encrypted', 'resale_license' => 'encrypted',
'smtp_password' => 'encrypted', 'smtp_password' => 'encrypted',
'allowed_ip_ranges' => 'array', 'allowed_ip_ranges' => 'array',
'is_auto_update_enabled' => 'boolean',
'auto_update_frequency' => 'string',
'update_check_frequency' => 'string',
]; ];
public function fqdn(): Attribute public function fqdn(): Attribute

34
app/Models/LocalFileVolume.php
View File

@@ -2,6 +2,7 @@
namespace App\Models; namespace App\Models;
use App\Events\FileStorageChanged;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
class LocalFileVolume extends BaseModel class LocalFileVolume extends BaseModel
@@ -33,16 +34,23 @@ class LocalFileVolume extends BaseModel
$workdir = $this->resource->workdir(); $workdir = $this->resource->workdir();
$server = $this->resource->destination->server; $server = $this->resource->destination->server;
} }
$commands = collect([ $commands = collect([]);
"cd $workdir",
]);
$fs_path = data_get($this, 'fs_path'); $fs_path = data_get($this, 'fs_path');
$isFile = instant_remote_process(["test -f $fs_path && echo OK || echo NOK"], $server);
$isDir = instant_remote_process(["test -d $fs_path && echo OK || echo NOK"], $server);
if ($fs_path && $fs_path != '/' && $fs_path != '.' && $fs_path != '..') { if ($fs_path && $fs_path != '/' && $fs_path != '.' && $fs_path != '..') {
$commands->push("rm -rf $fs_path"); ray($isFile, $isDir);
} if ($isFile === 'OK') {
ray($commands); $commands->push("rm -rf $fs_path > /dev/null 2>&1 || true");
return instant_remote_process($commands, $server); } elseif ($isDir === 'OK') {
$commands->push("rm -rf $fs_path > /dev/null 2>&1 || true");
$commands->push("rmdir $fs_path > /dev/null 2>&1 || true");
}
}
if ($commands->count() > 0) {
return instant_remote_process($commands, $server);
}
} }
public function saveStorageOnServer() public function saveStorageOnServer()
@@ -55,13 +63,10 @@ class LocalFileVolume extends BaseModel
$workdir = $this->resource->workdir(); $workdir = $this->resource->workdir();
$server = $this->resource->destination->server; $server = $this->resource->destination->server;
} }
$commands = collect([ $commands = collect([]);
"mkdir -p $workdir > /dev/null 2>&1 || true", if ($this->is_directory) {
"cd $workdir",
]);
$is_directory = $this->is_directory;
if ($is_directory) {
$commands->push("mkdir -p $this->fs_path > /dev/null 2>&1 || true"); $commands->push("mkdir -p $this->fs_path > /dev/null 2>&1 || true");
$commands->push("cd $workdir");
} }
if (str($this->fs_path)->startsWith('.') || str($this->fs_path)->startsWith('/') || str($this->fs_path)->startsWith('~')) { if (str($this->fs_path)->startsWith('.') || str($this->fs_path)->startsWith('/') || str($this->fs_path)->startsWith('~')) {
$parent_dir = str($this->fs_path)->beforeLast('/'); $parent_dir = str($this->fs_path)->beforeLast('/');
@@ -79,8 +84,11 @@ class LocalFileVolume extends BaseModel
$isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server); $isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
$isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server); $isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
if ($isFile == 'OK' && $fileVolume->is_directory) { if ($isFile == 'OK' && $fileVolume->is_directory) {
$content = instant_remote_process(["cat $path"], $server, false);
$fileVolume->is_directory = false; $fileVolume->is_directory = false;
$fileVolume->content = $content;
$fileVolume->save(); $fileVolume->save();
FileStorageChanged::dispatch(data_get($server, 'team_id'));
throw new \Exception('The following file is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.'); throw new \Exception('The following file is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.');
} elseif ($isDir == 'OK' && ! $fileVolume->is_directory) { } elseif ($isDir == 'OK' && ! $fileVolume->is_directory) {
$fileVolume->is_directory = true; $fileVolume->is_directory = true;

70
app/Models/Server.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\Actions\Server\InstallDocker; use App\Actions\Server\InstallDocker;
use App\Enums\ProxyTypes; use App\Enums\ProxyTypes;
use App\Jobs\PullSentinelImageJob; use App\Jobs\PullSentinelImageJob;
use App\Notifications\Server\Revived;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@@ -150,7 +151,7 @@ class Server extends BaseModel
$dynamic_conf_path = $this->proxyPath().'/dynamic'; $dynamic_conf_path = $this->proxyPath().'/dynamic';
$proxy_type = $this->proxyType(); $proxy_type = $this->proxyType();
$redirect_url = $this->proxy->redirect_url; $redirect_url = $this->proxy->redirect_url;
if ($proxy_type === 'TRAEFIK_V2') { if ($proxy_type === ProxyTypes::TRAEFIK->value) {
$default_redirect_file = "$dynamic_conf_path/default_redirect_404.yaml"; $default_redirect_file = "$dynamic_conf_path/default_redirect_404.yaml";
} elseif ($proxy_type === 'CADDY') { } elseif ($proxy_type === 'CADDY') {
$default_redirect_file = "$dynamic_conf_path/default_redirect_404.caddy"; $default_redirect_file = "$dynamic_conf_path/default_redirect_404.caddy";
@@ -180,7 +181,7 @@ respond 404
return; return;
} }
if ($proxy_type === 'TRAEFIK_V2') { if ($proxy_type === ProxyTypes::TRAEFIK->value) {
$dynamic_conf = [ $dynamic_conf = [
'http' => [ 'http' => [
'routers' => [ 'routers' => [
@@ -254,7 +255,7 @@ respond 404
{ {
$settings = \App\Models\InstanceSettings::get(); $settings = \App\Models\InstanceSettings::get();
$dynamic_config_path = $this->proxyPath().'/dynamic'; $dynamic_config_path = $this->proxyPath().'/dynamic';
if ($this->proxyType() === 'TRAEFIK_V2') { if ($this->proxyType() === ProxyTypes::TRAEFIK->value) {
$file = "$dynamic_config_path/coolify.yaml"; $file = "$dynamic_config_path/coolify.yaml";
if (empty($settings->fqdn) || (isCloud() && $this->id !== 0) || ! $this->isLocalhost()) { if (empty($settings->fqdn) || (isCloud() && $this->id !== 0) || ! $this->isLocalhost()) {
instant_remote_process([ instant_remote_process([
@@ -402,7 +403,7 @@ $schema://$host {
// TODO: should use /traefik for already exisiting configurations? // TODO: should use /traefik for already exisiting configurations?
// Should move everything except /caddy and /nginx to /traefik // Should move everything except /caddy and /nginx to /traefik
// The code needs to be modified as well, so maybe it does not worth it // The code needs to be modified as well, so maybe it does not worth it
if ($proxyType === ProxyTypes::TRAEFIK_V2->value) { if ($proxyType === ProxyTypes::TRAEFIK->value) {
$proxy_path = $proxy_path; $proxy_path = $proxy_path;
} elseif ($proxyType === ProxyTypes::CADDY->value) { } elseif ($proxyType === ProxyTypes::CADDY->value) {
$proxy_path = $proxy_path.'/caddy'; $proxy_path = $proxy_path.'/caddy';
@@ -420,7 +421,7 @@ $schema://$host {
// return $proxyType; // return $proxyType;
// } // }
// if (is_null($proxyType)) { // if (is_null($proxyType)) {
// $this->proxy->type = ProxyTypes::TRAEFIK_V2->value; // $this->proxy->type = ProxyTypes::TRAEFIK->value;
// $this->proxy->status = ProxyStatus::EXITED->value; // $this->proxy->status = ProxyStatus::EXITED->value;
// $this->save(); // $this->save();
// } // }
@@ -677,7 +678,49 @@ $schema://$host {
return instant_remote_process(["docker start $id"], $this); return instant_remote_process(["docker start $id"], $this);
} }
public function getContainers(): Collection public function getContainers()
{
$containers = collect([]);
$containerReplicates = collect([]);
if ($this->isSwarm()) {
$containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this, false);
$containers = format_docker_command_output_to_json($containers);
$containerReplicates = instant_remote_process(["docker service ls --format '{{json .}}'"], $this, false);
if ($containerReplicates) {
$containerReplicates = format_docker_command_output_to_json($containerReplicates);
foreach ($containerReplicates as $containerReplica) {
$name = data_get($containerReplica, 'Name');
$containers = $containers->map(function ($container) use ($name, $containerReplica) {
if (data_get($container, 'Spec.Name') === $name) {
$replicas = data_get($containerReplica, 'Replicas');
$running = str($replicas)->explode('/')[0];
$total = str($replicas)->explode('/')[1];
if ($running === $total) {
data_set($container, 'State.Status', 'running');
data_set($container, 'State.Health.Status', 'healthy');
} else {
data_set($container, 'State.Status', 'starting');
data_set($container, 'State.Health.Status', 'unhealthy');
}
}
return $container;
});
}
}
} else {
$containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this, false);
$containers = format_docker_command_output_to_json($containers);
$containerReplicates = collect([]);
}
return [
'containers' => $containers ?? collect([]),
'containerReplicates' => $containerReplicates ?? collect([]),
];
}
public function getContainersWithSentinel(): Collection
{ {
$sentinel_found = instant_remote_process(['docker inspect coolify-sentinel'], $this, false); $sentinel_found = instant_remote_process(['docker inspect coolify-sentinel'], $this, false);
$sentinel_found = json_decode($sentinel_found, true); $sentinel_found = json_decode($sentinel_found, true);
@@ -690,21 +733,6 @@ $schema://$host {
$containers = data_get(json_decode($containers, true), 'containers', []); $containers = data_get(json_decode($containers, true), 'containers', []);
return collect($containers); return collect($containers);
} else {
if ($this->isSwarm()) {
$containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this, false);
} else {
$containers = instant_remote_process(['docker container ls -q'], $this, false);
if (! $containers) {
return collect([]);
}
$containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this, false);
}
if (is_null($containers)) {
return collect([]);
}
return format_docker_command_output_to_json($containers);
} }
} }

12
app/Models/Service.php
View File

@@ -2,6 +2,7 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
@@ -39,6 +40,8 @@ class Service extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['server_status'];
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$domains = $this->applications()->get()->pluck('fqdn')->sort()->toArray(); $domains = $this->applications()->get()->pluck('fqdn')->sort()->toArray();
@@ -77,6 +80,15 @@ class Service extends BaseModel
} }
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->server->isFunctional();
}
);
}
public function isRunning() public function isRunning()
{ {
return (bool) str($this->status())->contains('running'); return (bool) str($this->status())->contains('running');

11
app/Models/StandaloneClickhouse.php
View File

@@ -14,7 +14,7 @@ class StandaloneClickhouse extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url', 'database_type']; protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
protected $casts = [ protected $casts = [
'clickhouse_password' => 'encrypted', 'clickhouse_password' => 'encrypted',
@@ -40,6 +40,15 @@ class StandaloneClickhouse extends BaseModel
}); });
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$newConfigHash = $this->image.$this->ports_mappings; $newConfigHash = $this->image.$this->ports_mappings;

11
app/Models/StandaloneDragonfly.php
View File

@@ -14,7 +14,7 @@ class StandaloneDragonfly extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url', 'database_type']; protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
protected $casts = [ protected $casts = [
'dragonfly_password' => 'encrypted', 'dragonfly_password' => 'encrypted',
@@ -40,6 +40,15 @@ class StandaloneDragonfly extends BaseModel
}); });
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$newConfigHash = $this->image.$this->ports_mappings; $newConfigHash = $this->image.$this->ports_mappings;

11
app/Models/StandaloneKeydb.php
View File

@@ -14,7 +14,7 @@ class StandaloneKeydb extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url']; protected $appends = ['internal_db_url', 'external_db_url', 'server_status'];
protected $casts = [ protected $casts = [
'keydb_password' => 'encrypted', 'keydb_password' => 'encrypted',
@@ -40,6 +40,15 @@ class StandaloneKeydb extends BaseModel
}); });
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$newConfigHash = $this->image.$this->ports_mappings.$this->keydb_conf; $newConfigHash = $this->image.$this->ports_mappings.$this->keydb_conf;

11
app/Models/StandaloneMariadb.php
View File

@@ -14,7 +14,7 @@ class StandaloneMariadb extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url', 'database_type']; protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
protected $casts = [ protected $casts = [
'mariadb_password' => 'encrypted', 'mariadb_password' => 'encrypted',
@@ -40,6 +40,15 @@ class StandaloneMariadb extends BaseModel
}); });
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$newConfigHash = $this->image.$this->ports_mappings.$this->mariadb_conf; $newConfigHash = $this->image.$this->ports_mappings.$this->mariadb_conf;

11
app/Models/StandaloneMongodb.php
View File

@@ -14,7 +14,7 @@ class StandaloneMongodb extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url', 'database_type']; protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
protected static function booted() protected static function booted()
{ {
@@ -44,6 +44,15 @@ class StandaloneMongodb extends BaseModel
}); });
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$newConfigHash = $this->image.$this->ports_mappings.$this->mongo_conf; $newConfigHash = $this->image.$this->ports_mappings.$this->mongo_conf;

11
app/Models/StandaloneMysql.php
View File

@@ -14,7 +14,7 @@ class StandaloneMysql extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url', 'database_type']; protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
protected $casts = [ protected $casts = [
'mysql_password' => 'encrypted', 'mysql_password' => 'encrypted',
@@ -41,6 +41,15 @@ class StandaloneMysql extends BaseModel
}); });
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$newConfigHash = $this->image.$this->ports_mappings.$this->mysql_conf; $newConfigHash = $this->image.$this->ports_mappings.$this->mysql_conf;

11
app/Models/StandalonePostgresql.php
View File

@@ -14,7 +14,7 @@ class StandalonePostgresql extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url', 'database_type']; protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
protected $casts = [ protected $casts = [
'init_scripts' => 'array', 'init_scripts' => 'array',
@@ -46,6 +46,15 @@ class StandalonePostgresql extends BaseModel
return database_configuration_dir()."/{$this->uuid}"; return database_configuration_dir()."/{$this->uuid}";
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function delete_configurations() public function delete_configurations()
{ {
$server = data_get($this, 'destination.server'); $server = data_get($this, 'destination.server');

11
app/Models/StandaloneRedis.php
View File

@@ -14,7 +14,7 @@ class StandaloneRedis extends BaseModel
protected $guarded = []; protected $guarded = [];
protected $appends = ['internal_db_url', 'external_db_url', 'database_type']; protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status'];
protected static function booted() protected static function booted()
{ {
@@ -36,6 +36,15 @@ class StandaloneRedis extends BaseModel
}); });
} }
protected function serverStatus(): Attribute
{
return Attribute::make(
get: function () {
return $this->destination->server->isFunctional();
}
);
}
public function isConfigurationChanged(bool $save = false) public function isConfigurationChanged(bool $save = false)
{ {
$newConfigHash = $this->image.$this->ports_mappings.$this->redis_conf; $newConfigHash = $this->image.$this->ports_mappings.$this->redis_conf;

15
app/Notifications/Server/Revived.php
View File

@@ -12,6 +12,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification; use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\RateLimiter;
class Revived extends Notification implements ShouldQueue class Revived extends Notification implements ShouldQueue
{ {
@@ -44,8 +45,20 @@ class Revived extends Notification implements ShouldQueue
if ($isTelegramEnabled) { if ($isTelegramEnabled) {
$channels[] = TelegramChannel::class; $channels[] = TelegramChannel::class;
} }
$executed = RateLimiter::attempt(
'notification-server-revived-'.$this->server->uuid,
1,
function () use ($channels) {
return $channels;
},
7200,
);
return $channels; if (! $executed) {
return [];
}
return $executed;
} }
public function toMail(): MailMessage public function toMail(): MailMessage

15
app/Notifications/Server/Unreachable.php
View File

@@ -10,6 +10,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification; use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\RateLimiter;
class Unreachable extends Notification implements ShouldQueue class Unreachable extends Notification implements ShouldQueue
{ {
@@ -35,8 +36,20 @@ class Unreachable extends Notification implements ShouldQueue
if ($isTelegramEnabled) { if ($isTelegramEnabled) {
$channels[] = TelegramChannel::class; $channels[] = TelegramChannel::class;
} }
$executed = RateLimiter::attempt(
'notification-server-unreachable-'.$this->server->uuid,
1,
function () use ($channels) {
return $channels;
},
7200,
);
return $channels; if (! $executed) {
return [];
}
return $executed;
} }
public function toMail(): MailMessage public function toMail(): MailMessage

6
app/Providers/FortifyServiceProvider.php
View File

@@ -44,6 +44,8 @@ class FortifyServiceProvider extends ServiceProvider
{ {
Fortify::createUsersUsing(CreateNewUser::class); Fortify::createUsersUsing(CreateNewUser::class);
Fortify::registerView(function () { Fortify::registerView(function () {
$isFirstUser = User::count() === 0;
$settings = \App\Models\InstanceSettings::get(); $settings = \App\Models\InstanceSettings::get();
if (! $settings->is_registration_enabled) { if (! $settings->is_registration_enabled) {
return redirect()->route('login'); return redirect()->route('login');
@@ -51,7 +53,9 @@ class FortifyServiceProvider extends ServiceProvider
if (config('coolify.waitlist')) { if (config('coolify.waitlist')) {
return redirect()->route('waitlist.index'); return redirect()->route('waitlist.index');
} else { } else {
return view('auth.register'); return view('auth.register', [
'isFirstUser' => $isFirstUser,
]);
} }
}); });

132
bootstrap/helpers/docker.php
View File

@@ -1,5 +1,6 @@
<?php <?php
use App\Enums\ProxyTypes;
use App\Models\Application; use App\Models\Application;
use App\Models\ApplicationPreview; use App\Models\ApplicationPreview;
use App\Models\Server; use App\Models\Server;
@@ -539,26 +540,55 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
if ($pull_request_id === 0) { if ($pull_request_id === 0) {
if ($application->fqdn) { if ($application->fqdn) {
$domains = str(data_get($application, 'fqdn'))->explode(','); $domains = str(data_get($application, 'fqdn'))->explode(',');
$labels = $labels->merge(fqdnLabelsForTraefik( $shouldGenerateLabelsExactly = $application->destination->server->settings->generate_exact_labels;
uuid: $appUuid, if ($shouldGenerateLabelsExactly) {
domains: $domains, switch ($application->destination->server->proxyType()) {
onlyPort: $onlyPort, case ProxyTypes::TRAEFIK->value:
is_force_https_enabled: $application->isForceHttpsEnabled(), $labels = $labels->merge(fqdnLabelsForTraefik(
is_gzip_enabled: $application->isGzipEnabled(), uuid: $appUuid,
is_stripprefix_enabled: $application->isStripprefixEnabled(), domains: $domains,
redirect_direction: $application->redirect onlyPort: $onlyPort,
)); is_force_https_enabled: $application->isForceHttpsEnabled(),
// Add Caddy labels is_gzip_enabled: $application->isGzipEnabled(),
$labels = $labels->merge(fqdnLabelsForCaddy( is_stripprefix_enabled: $application->isStripprefixEnabled(),
network: $application->destination->network, redirect_direction: $application->redirect
uuid: $appUuid, ));
domains: $domains, break;
onlyPort: $onlyPort, case ProxyTypes::CADDY->value:
is_force_https_enabled: $application->isForceHttpsEnabled(), $labels = $labels->merge(fqdnLabelsForCaddy(
is_gzip_enabled: $application->isGzipEnabled(), network: $application->destination->network,
is_stripprefix_enabled: $application->isStripprefixEnabled(), uuid: $appUuid,
redirect_direction: $application->redirect domains: $domains,
)); onlyPort: $onlyPort,
is_force_https_enabled: $application->isForceHttpsEnabled(),
is_gzip_enabled: $application->isGzipEnabled(),
is_stripprefix_enabled: $application->isStripprefixEnabled(),
redirect_direction: $application->redirect
));
break;
}
} else {
$labels = $labels->merge(fqdnLabelsForTraefik(
uuid: $appUuid,
domains: $domains,
onlyPort: $onlyPort,
is_force_https_enabled: $application->isForceHttpsEnabled(),
is_gzip_enabled: $application->isGzipEnabled(),
is_stripprefix_enabled: $application->isStripprefixEnabled(),
redirect_direction: $application->redirect
));
$labels = $labels->merge(fqdnLabelsForCaddy(
network: $application->destination->network,
uuid: $appUuid,
domains: $domains,
onlyPort: $onlyPort,
is_force_https_enabled: $application->isForceHttpsEnabled(),
is_gzip_enabled: $application->isGzipEnabled(),
is_stripprefix_enabled: $application->isStripprefixEnabled(),
redirect_direction: $application->redirect
));
}
} }
} else { } else {
if (data_get($preview, 'fqdn')) { if (data_get($preview, 'fqdn')) {
@@ -566,24 +596,50 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
} else { } else {
$domains = collect([]); $domains = collect([]);
} }
$labels = $labels->merge(fqdnLabelsForTraefik( $shouldGenerateLabelsExactly = $application->destination->server->settings->generate_exact_labels;
uuid: $appUuid, if ($shouldGenerateLabelsExactly) {
domains: $domains, switch ($application->destination->server->proxyType()) {
onlyPort: $onlyPort, case ProxyTypes::TRAEFIK->value:
is_force_https_enabled: $application->isForceHttpsEnabled(), $labels = $labels->merge(fqdnLabelsForTraefik(
is_gzip_enabled: $application->isGzipEnabled(), uuid: $appUuid,
is_stripprefix_enabled: $application->isStripprefixEnabled() domains: $domains,
)); onlyPort: $onlyPort,
// Add Caddy labels is_force_https_enabled: $application->isForceHttpsEnabled(),
$labels = $labels->merge(fqdnLabelsForCaddy( is_gzip_enabled: $application->isGzipEnabled(),
network: $application->destination->network, is_stripprefix_enabled: $application->isStripprefixEnabled()
uuid: $appUuid, ));
domains: $domains, break;
onlyPort: $onlyPort, case ProxyTypes::CADDY->value:
is_force_https_enabled: $application->isForceHttpsEnabled(), $labels = $labels->merge(fqdnLabelsForCaddy(
is_gzip_enabled: $application->isGzipEnabled(), network: $application->destination->network,
is_stripprefix_enabled: $application->isStripprefixEnabled() uuid: $appUuid,
)); domains: $domains,
onlyPort: $onlyPort,
is_force_https_enabled: $application->isForceHttpsEnabled(),
is_gzip_enabled: $application->isGzipEnabled(),
is_stripprefix_enabled: $application->isStripprefixEnabled()
));
break;
}
} else {
$labels = $labels->merge(fqdnLabelsForTraefik(
uuid: $appUuid,
domains: $domains,
onlyPort: $onlyPort,
is_force_https_enabled: $application->isForceHttpsEnabled(),
is_gzip_enabled: $application->isGzipEnabled(),
is_stripprefix_enabled: $application->isStripprefixEnabled()
));
$labels = $labels->merge(fqdnLabelsForCaddy(
network: $application->destination->network,
uuid: $appUuid,
domains: $domains,
onlyPort: $onlyPort,
is_force_https_enabled: $application->isForceHttpsEnabled(),
is_gzip_enabled: $application->isGzipEnabled(),
is_stripprefix_enabled: $application->isStripprefixEnabled()
));
}
} }

17
bootstrap/helpers/proxy.php
View File

@@ -24,6 +24,7 @@ function collectProxyDockerNetworksByServer(Server $server)
} }
function collectDockerNetworksByServer(Server $server) function collectDockerNetworksByServer(Server $server)
{ {
$allNetworks = collect([]);
if ($server->isSwarm()) { if ($server->isSwarm()) {
$networks = collect($server->swarmDockers)->map(function ($docker) { $networks = collect($server->swarmDockers)->map(function ($docker) {
return $docker['network']; return $docker['network'];
@@ -34,11 +35,13 @@ function collectDockerNetworksByServer(Server $server)
return $docker['network']; return $docker['network'];
}); });
} }
$allNetworks = $allNetworks->merge($networks);
// Service networks // Service networks
foreach ($server->services()->get() as $service) { foreach ($server->services()->get() as $service) {
if ($service->isRunning()) { if ($service->isRunning()) {
$networks->push($service->networks()); $networks->push($service->networks());
} }
$allNetworks->push($service->networks());
} }
// Docker compose based apps // Docker compose based apps
$docker_compose_apps = $server->dockerComposeBasedApplications(); $docker_compose_apps = $server->dockerComposeBasedApplications();
@@ -46,6 +49,7 @@ function collectDockerNetworksByServer(Server $server)
if ($app->isRunning()) { if ($app->isRunning()) {
$networks->push($app->uuid); $networks->push($app->uuid);
} }
$allNetworks->push($app->uuid);
} }
// Docker compose based preview deployments // Docker compose based preview deployments
$docker_compose_previews = $server->dockerComposeBasedPreviewDeployments(); $docker_compose_previews = $server->dockerComposeBasedPreviewDeployments();
@@ -61,23 +65,30 @@ function collectDockerNetworksByServer(Server $server)
} }
$network = "{$application->uuid}-{$pullRequestId}"; $network = "{$application->uuid}-{$pullRequestId}";
$networks->push($network); $networks->push($network);
$allNetworks->push($network);
} }
$networks = collect($networks)->flatten()->unique(); $networks = collect($networks)->flatten()->unique();
$allNetworks = $allNetworks->flatten()->unique();
if ($server->isSwarm()) { if ($server->isSwarm()) {
if ($networks->count() === 0) { if ($networks->count() === 0) {
$networks = collect(['coolify-overlay']); $networks = collect(['coolify-overlay']);
$allNetworks = collect(['coolify-overlay']);
} }
} else { } else {
if ($networks->count() === 0) { if ($networks->count() === 0) {
$networks = collect(['coolify']); $networks = collect(['coolify']);
$allNetworks = collect(['coolify']);
} }
} }
return $networks; return [
'networks' => $networks,
'allNetworks' => $allNetworks,
];
} }
function connectProxyToNetworks(Server $server) function connectProxyToNetworks(Server $server)
{ {
$networks = collectDockerNetworksByServer($server); ['networks' => $networks] = collectDockerNetworksByServer($server);
if ($server->isSwarm()) { if ($server->isSwarm()) {
$commands = $networks->map(function ($network) { $commands = $networks->map(function ($network) {
return [ return [
@@ -125,7 +136,7 @@ function generate_default_proxy_configuration(Server $server)
'external' => true, 'external' => true,
]; ];
}); });
if ($proxy_type === 'TRAEFIK_V2') { if ($proxy_type === ProxyTypes::TRAEFIK->value) {
$labels = [ $labels = [
'traefik.enable=true', 'traefik.enable=true',
'traefik.http.routers.traefik.entrypoints=http', 'traefik.http.routers.traefik.entrypoints=http',

50
bootstrap/helpers/services.php
View File

@@ -78,7 +78,7 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Appli
$fileVolume->is_directory = true; $fileVolume->is_directory = true;
$fileVolume->save(); $fileVolume->save();
instant_remote_process(["mkdir -p $fileLocation"], $server); instant_remote_process(["mkdir -p $fileLocation"], $server);
} elseif ($isFile == 'NOK' && $isDir == 'NOK' && ! $fileVolume->is_directory && $isInit && ! $content) { } elseif ($isFile == 'NOK' && $isDir == 'NOK' && ! $fileVolume->is_directory && $isInit && is_null($content)) {
// Does not exists (no dir or file), not flagged as directory, is init, has no content => create directory // Does not exists (no dir or file), not flagged as directory, is init, has no content => create directory
$fileVolume->content = null; $fileVolume->content = null;
$fileVolume->is_directory = true; $fileVolume->is_directory = true;
@@ -122,14 +122,22 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$path = $fqdn->getPath(); $path = $fqdn->getPath();
$fqdn = $fqdn->getScheme().'://'.$fqdn->getHost(); $fqdn = $fqdn->getScheme().'://'.$fqdn->getHost();
if ($generatedEnv) { if ($generatedEnv) {
$generatedEnv->value = $fqdn.$path; if ($path === '/') {
$generatedEnv->value = $fqdn;
} else {
$generatedEnv->value = $fqdn.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
if ($port) { if ($port) {
$variableName = $variableName."_$port"; $variableName = $variableName."_$port";
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first(); $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
if ($generatedEnv) { if ($generatedEnv) {
$generatedEnv->value = $fqdn.$path; if ($path === '/') {
$generatedEnv->value = $fqdn;
} else {
$generatedEnv->value = $fqdn.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
} }
@@ -141,14 +149,22 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$url = $url->getHost(); $url = $url->getHost();
if ($generatedEnv) { if ($generatedEnv) {
$url = str($fqdn)->after('://'); $url = str($fqdn)->after('://');
$generatedEnv->value = $url.$path; if ($path === '/') {
$generatedEnv->value = $url;
} else {
$generatedEnv->value = $url.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
if ($port) { if ($port) {
$variableName = $variableName."_$port"; $variableName = $variableName."_$port";
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first(); $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
if ($generatedEnv) { if ($generatedEnv) {
$generatedEnv->value = $url.$path; if ($path === '/') {
$generatedEnv->value = $url;
} else {
$generatedEnv->value = $url.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
} }
@@ -165,10 +181,18 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$service_fqdn = str($port_env->key)->beforeLast('_')->after('SERVICE_FQDN_'); $service_fqdn = str($port_env->key)->beforeLast('_')->after('SERVICE_FQDN_');
$env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_FQDN_'.$service_fqdn)->first(); $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_FQDN_'.$service_fqdn)->first();
if ($env) { if ($env) {
$env->value = $host.$path; if ($path === '/') {
$env->value = $host;
} else {
$env->value = $host.$path;
}
$env->save(); $env->save();
} }
$port_env->value = $host.$path; if ($path === '/') {
$port_env->value = $host;
} else {
$port_env->value = $host.$path;
}
$port_env->save(); $port_env->save();
} }
$port_envs_url = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_URL_%_$port")->get(); $port_envs_url = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_URL_%_$port")->get();
@@ -176,10 +200,18 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$service_url = str($port_env_url->key)->beforeLast('_')->after('SERVICE_URL_'); $service_url = str($port_env_url->key)->beforeLast('_')->after('SERVICE_URL_');
$env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_URL_'.$service_url)->first(); $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_URL_'.$service_url)->first();
if ($env) { if ($env) {
$env->value = $url.$path; if ($path === '/') {
$env->value = $url;
} else {
$env->value = $url.$path;
}
$env->save(); $env->save();
} }
$port_env_url->value = $url.$path; if ($path === '/') {
$port_env_url->value = $url;
} else {
$port_env_url->value = $url.$path;
}
$port_env_url->save(); $port_env_url->save();
} }
} else { } else {

158
bootstrap/helpers/shared.php
View File

@@ -1,6 +1,7 @@
<?php <?php
use App\Enums\ApplicationDeploymentStatus; use App\Enums\ApplicationDeploymentStatus;
use App\Enums\ProxyTypes;
use App\Jobs\ServerFilesFromServerJob; use App\Jobs\ServerFilesFromServerJob;
use App\Models\Application; use App\Models\Application;
use App\Models\ApplicationDeploymentQueue; use App\Models\ApplicationDeploymentQueue;
@@ -181,11 +182,7 @@ function get_latest_version_of_coolify(): string
$versions = json_decode($versions, true); $versions = json_decode($versions, true);
return data_get($versions, 'coolify.v4.version'); return data_get($versions, 'coolify.v4.version');
// $response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
// $versions = $response->json();
// return data_get($versions, 'coolify.v4.version');
} catch (\Throwable $e) { } catch (\Throwable $e) {
//throw $e;
ray($e->getMessage()); ray($e->getMessage());
return '0.0.0'; return '0.0.0';
@@ -505,7 +502,7 @@ function get_service_templates(bool $force = false): Collection
{ {
if ($force) { if ($force) {
try { try {
$response = Http::retry(3, 50)->get(config('constants.services.official')); $response = Http::retry(3, 1000)->get(config('constants.services.official'));
if ($response->failed()) { if ($response->failed()) {
return collect([]); return collect([]);
} }
@@ -1308,27 +1305,58 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$serviceLabels = $serviceLabels->merge($defaultLabels); $serviceLabels = $serviceLabels->merge($defaultLabels);
if (! $isDatabase && $fqdns->count() > 0) { if (! $isDatabase && $fqdns->count() > 0) {
if ($fqdns) { if ($fqdns) {
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik( $shouldGenerateLabelsExactly = $resource->server->settings->generate_exact_labels;
uuid: $resource->uuid, if ($shouldGenerateLabelsExactly) {
domains: $fqdns, switch ($resource->server->proxyType()) {
is_force_https_enabled: true, case ProxyTypes::TRAEFIK->value:
serviceLabels: $serviceLabels, $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
is_gzip_enabled: $savedService->isGzipEnabled(), uuid: $resource->uuid,
is_stripprefix_enabled: $savedService->isStripprefixEnabled(), domains: $fqdns,
service_name: $serviceName, is_force_https_enabled: true,
image: data_get($service, 'image') serviceLabels: $serviceLabels,
)); is_gzip_enabled: $savedService->isGzipEnabled(),
$serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy( is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
network: $resource->destination->network, service_name: $serviceName,
uuid: $resource->uuid, image: data_get($service, 'image')
domains: $fqdns, ));
is_force_https_enabled: true, break;
serviceLabels: $serviceLabels, case ProxyTypes::CADDY->value:
is_gzip_enabled: $savedService->isGzipEnabled(), $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
is_stripprefix_enabled: $savedService->isStripprefixEnabled(), network: $resource->destination->network,
service_name: $serviceName, uuid: $resource->uuid,
image: data_get($service, 'image') domains: $fqdns,
)); is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $savedService->isGzipEnabled(),
is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
service_name: $serviceName,
image: data_get($service, 'image')
));
break;
}
} else {
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
uuid: $resource->uuid,
domains: $fqdns,
is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $savedService->isGzipEnabled(),
is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
service_name: $serviceName,
image: data_get($service, 'image')
));
$serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
network: $resource->destination->network,
uuid: $resource->uuid,
domains: $fqdns,
is_force_https_enabled: true,
serviceLabels: $serviceLabels,
is_gzip_enabled: $savedService->isGzipEnabled(),
is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
service_name: $serviceName,
image: data_get($service, 'image')
));
}
} }
} }
if ($resource->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) { if ($resource->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) {
@@ -2034,26 +2062,64 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
}); });
} }
} }
$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik( $shouldGenerateLabelsExactly = $server->settings->generate_exact_labels;
uuid: $resource->uuid, if ($shouldGenerateLabelsExactly) {
domains: $fqdns, switch ($server->proxyType()) {
serviceLabels: $serviceLabels, case ProxyTypes::TRAEFIK->value:
generate_unique_uuid: $resource->build_pack === 'dockercompose', $serviceLabels = $serviceLabels->merge(
image: data_get($service, 'image'), fqdnLabelsForTraefik(
is_force_https_enabled: $resource->isForceHttpsEnabled(), uuid: $resource->uuid,
is_gzip_enabled: $resource->isGzipEnabled(), domains: $fqdns,
is_stripprefix_enabled: $resource->isStripprefixEnabled(), serviceLabels: $serviceLabels,
)); generate_unique_uuid: $resource->build_pack === 'dockercompose',
$serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy( image: data_get($service, 'image'),
network: $resource->destination->network, is_force_https_enabled: $resource->isForceHttpsEnabled(),
uuid: $resource->uuid, is_gzip_enabled: $resource->isGzipEnabled(),
domains: $fqdns, is_stripprefix_enabled: $resource->isStripprefixEnabled(),
serviceLabels: $serviceLabels, )
image: data_get($service, 'image'), );
is_force_https_enabled: $resource->isForceHttpsEnabled(), break;
is_gzip_enabled: $resource->isGzipEnabled(), case ProxyTypes::CADDY->value:
is_stripprefix_enabled: $resource->isStripprefixEnabled(), $serviceLabels = $serviceLabels->merge(
)); fqdnLabelsForCaddy(
network: $resource->destination->network,
uuid: $resource->uuid,
domains: $fqdns,
serviceLabels: $serviceLabels,
image: data_get($service, 'image'),
is_force_https_enabled: $resource->isForceHttpsEnabled(),
is_gzip_enabled: $resource->isGzipEnabled(),
is_stripprefix_enabled: $resource->isStripprefixEnabled(),
)
);
break;
}
} else {
$serviceLabels = $serviceLabels->merge(
fqdnLabelsForTraefik(
uuid: $resource->uuid,
domains: $fqdns,
serviceLabels: $serviceLabels,
generate_unique_uuid: $resource->build_pack === 'dockercompose',
image: data_get($service, 'image'),
is_force_https_enabled: $resource->isForceHttpsEnabled(),
is_gzip_enabled: $resource->isGzipEnabled(),
is_stripprefix_enabled: $resource->isStripprefixEnabled(),
)
);
$serviceLabels = $serviceLabels->merge(
fqdnLabelsForCaddy(
network: $resource->destination->network,
uuid: $resource->uuid,
domains: $fqdns,
serviceLabels: $serviceLabels,
image: data_get($service, 'image'),
is_force_https_enabled: $resource->isForceHttpsEnabled(),
is_gzip_enabled: $resource->isGzipEnabled(),
is_stripprefix_enabled: $resource->isStripprefixEnabled(),
)
);
}
} }
} }
} }

32
database/migrations/2024_08_05_142659_add_update_frequency_settings.php Normal file
View File

@@ -0,0 +1,32 @@
<?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::table('instance_settings', function (Blueprint $table) {
$table->string('auto_update_frequency')->default('0 0 * * *');
$table->string('update_check_frequency')->default('0 * * * *');
$table->boolean('new_version_available')->default(false);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('instance_settings', function (Blueprint $table) {
$table->dropColumn('update_check_frequency');
$table->dropColumn('auto_update_frequency');
$table->dropColumn('new_version_available');
});
}
};

28
database/migrations/2024_08_07_155324_add_proxy_label_chooser.php Normal file
View File

@@ -0,0 +1,28 @@
<?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::table('server_settings', function (Blueprint $table) {
$table->boolean('generate_exact_labels')->default(false);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('server_settings', function (Blueprint $table) {
$table->dropColumn('generate_exact_labels');
});
}
};

4
database/seeders/ProductionSeeder.php
View File

@@ -100,7 +100,7 @@ class ProductionSeeder extends Seeder
'private_key_id' => 0, 'private_key_id' => 0,
]; ];
$server_details['proxy'] = ServerMetadata::from([ $server_details['proxy'] = ServerMetadata::from([
'type' => ProxyTypes::TRAEFIK_V2->value, 'type' => ProxyTypes::TRAEFIK->value,
'status' => ProxyStatus::EXITED->value, 'status' => ProxyStatus::EXITED->value,
]); ]);
$server = Server::create($server_details); $server = Server::create($server_details);
@@ -153,7 +153,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
'private_key_id' => 0, 'private_key_id' => 0,
]; ];
$server_details['proxy'] = ServerMetadata::from([ $server_details['proxy'] = ServerMetadata::from([
'type' => ProxyTypes::TRAEFIK_V2->value, 'type' => ProxyTypes::TRAEFIK->value,
'status' => ProxyStatus::EXITED->value, 'status' => ProxyStatus::EXITED->value,
]); ]);
$server = Server::create($server_details); $server = Server::create($server_details);

1
public/svgs/minecraft.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144px" height="144px"><path fill="#8BC34A" d="M11 7L21 7 20 11 23 11 21 16 25 16 27 11 30 11 31 7 41 7 35 33 3 33z"/><path fill="#263238" d="M40.754,6H40h-9h-0.74l-1.182,5H27.5h-1.299l-0.509,1.854L20.785,6H20h-7.266H11h-0.359h-0.01L2,33l8.908,9h0.229h2.004h7.982l1.523-6.172L23.698,37h2.62l4.104,5H30.6h1.784h8.538L46,17L40.754,6z M31.333,8h8.133l-1.808,8h-3.754l1.086-4.402c0.029-0.146-0.009-0.299-0.104-0.415C34.792,11.067,34.649,11,34.5,11h-3.908L31.333,8z M27.5,11.916V12h6.39l-1.012,4h-6.581l1.087-3.66L27.5,11.916z M18.887,11h-7.715l0.938-3h7.688L18.887,11z M12.334,33.042H4.369L4.328,33H4.297l3.125-10h1.915L7.52,29.362c-0.043,0.151-0.014,0.313,0.081,0.438C7.695,29.927,7.843,30,8,30h5.217L12.334,33.042z M9.52,26h4.858l-0.871,3H8.663L9.52,26z M25.094,33l2.628-11h-2.094h-1.121l-1.352,5H17.4l1.354-5h-3.215l-0.871,3H9.806l0.675-2.362c0.043-0.151,0.014-0.313-0.081-0.438C10.305,22.073,10.157,22,10,22H7.734l3.125-10h7.725H19h2.292l-1.354,5H25h1h11.432l-3.615,16H25.094z"/><path fill="#8D6E63" d="M18.841 40L12.334 33 4.328 33 11.182 40zM38.801 40L33.816 33 25.094 33 30.764 40zM23.036 33L23 33 24.117 28.324 23.084 27 17.484 27 24.071 35.001 24.678 35.001z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

13
resources/views/auth/register.blade.php
View File

@@ -16,9 +16,16 @@ $email = getOldOrLocal('email', 'test3@example.com');
</a> </a>
<div class="w-full bg-white rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base"> <div class="w-full bg-white rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base">
<div class="p-6 space-y-4 md:space-y-6 sm:p-8"> <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
<h1 class="text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white"> <div>
Create an account <h1
</h1> class="text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white">
Create an account
</h1>
@if ($isFirstUser)
<div class="text-xs dark:text-warning">This user will be the root user (full admin access).
</div>
@endif
</div>
<form action="/register" method="POST" class="flex flex-col gap-2"> <form action="/register" method="POST" class="flex flex-col gap-2">
@csrf @csrf
<x-forms.input id="name" required type="text" name="name" value="{{ $name }}" <x-forms.input id="name" required type="text" name="name" value="{{ $name }}"

42
resources/views/components/navbar.blade.php
View File

@@ -351,6 +351,9 @@
</a> </a>
</li> </li>
@endif @endif
@if (!isSubscribed() && isCloud() && auth()->user()->teams()->get()->count() > 1)
<livewire:navbar-delete-team />
@endif
<li> <li>
<x-modal-input title="How can we help?"> <x-modal-input title="How can we help?">
<x-slot:content> <x-slot:content>
@@ -380,44 +383,5 @@
</li> </li>
</ul> </ul>
</li> </li>
{{-- <li>
<div class="text-xs font-semibold leading-6 text-gray-400">Your teams</div>
<ul role="list" class="mt-2 -mx-2 space-y-1">
<li>
<a href="#"
class="flex p-2 text-sm font-semibold leading-6 text-gray-700 rounded-md hover:text-indigo-600 hover:bg-gray-50 group gap-x-3">
<span
class="flex h-6 w-6 shrink-0 items-center justify-center rounded-lg border text-[0.625rem] font-medium bg-white text-gray-400 border-gray-200 group-hover:border-indigo-600 group-hover:text-indigo-600">H</span>
<span class="truncate">Heroicons</span>
</a>
</li>
<li>
<a href="#"
class="flex p-2 text-sm font-semibold leading-6 text-gray-700 rounded-md hover:text-indigo-600 hover:bg-gray-50 group gap-x-3">
<span
class="flex h-6 w-6 shrink-0 items-center justify-center rounded-lg border text-[0.625rem] font-medium bg-white text-gray-400 border-gray-200 group-hover:border-indigo-600 group-hover:text-indigo-600">T</span>
<span class="truncate">Tailwind Labs</span>
</a>
</li>
<li>
<a href="#"
class="flex p-2 text-sm font-semibold leading-6 text-gray-700 rounded-md hover:text-indigo-600 hover:bg-gray-50 group gap-x-3">
<span
class="flex h-6 w-6 shrink-0 items-center justify-center rounded-lg border text-[0.625rem] font-medium bg-white text-gray-400 border-gray-200 group-hover:border-indigo-600 group-hover:text-indigo-600">W</span>
<span class="truncate">Workcation</span>
</a>
</li>
</ul>
</li>
<li class="mt-auto -mx-6">
<a href="#"
class="flex items-center px-6 py-3 text-sm font-semibold leading-6 text-gray-900 gap-x-4 hover:bg-gray-50">
<img class="w-8 h-8 rounded-full bg-gray-50"
src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
alt="">
<span class="sr-only">Your profile</span>
<span aria-hidden="true">Tom Cook</span>
</a>
</li> --}}
</ul> </ul>
</nav> </nav>

10
resources/views/components/server/sidebar.blade.php
View File

@@ -5,11 +5,11 @@
<button>Configuration</button> <button>Configuration</button>
</a> </a>
@if ($server->proxyType() !== 'NONE') @if ($server->proxyType() !== 'NONE')
{{-- @if ($server->proxyType() === 'TRAEFIK_V2') --}} {{-- @if ($server->proxyType() === 'TRAEFIK') --}}
<a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'dark:text-white' : '' }}" <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'dark:text-white' : '' }}"
href="{{ route('server.proxy.dynamic-confs', $parameters) }}"> href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
<button>Dynamic Configurations</button> <button>Dynamic Configurations</button>
</a> </a>
{{-- @endif --}} {{-- @endif --}}
<a class="{{ request()->routeIs('server.proxy.logs') ? 'dark:text-white' : '' }}" <a class="{{ request()->routeIs('server.proxy.logs') ? 'dark:text-white' : '' }}"
href="{{ route('server.proxy.logs', $parameters) }}"> href="{{ route('server.proxy.logs', $parameters) }}">

12
resources/views/components/settings/navbar.blade.php
View File

@@ -13,6 +13,18 @@
<button>Resale License</button> <button>Resale License</button>
</a> </a>
@endif @endif
<a class="{{ request()->routeIs('settings.backup') ? 'dark:text-white' : '' }}"
href="{{ route('settings.backup') }}">
<button>Backup</button>
</a>
<a class="{{ request()->routeIs('settings.email') ? 'dark:text-white' : '' }}"
href="{{ route('settings.email') }}">
<button>Transactional Email</button>
</a>
<a class="{{ request()->routeIs('settings.oauth') ? 'dark:text-white' : '' }}"
href="{{ route('settings.oauth') }}">
<button>OAuth</button>
</a>
<div class="flex-1"></div> <div class="flex-1"></div>
</nav> </nav>
</div> </div>

5
resources/views/livewire/navbar-delete-team.blade.php Normal file
View File

@@ -0,0 +1,5 @@
<div>
<x-modal-confirmation buttonFullWidth isErrorButton buttonTitle="Delete Team">
This team be deleted. It is not reversible. <br>Please think again.
</x-modal-confirmation>
</div>

8
resources/views/livewire/project/application/configuration.blade.php
View File

@@ -41,6 +41,14 @@
</svg> </svg>
</span> </span>
@endif @endif
@if ($application->server_status == false)
<span title="The underlying server(s) has problems.">
<svg class="w-4 h-4 text-error" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
<path fill="currentColor"
d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />
</svg>
</span>
@endif
</a> </a>
<a class="menu-item" :class="activeTab === 'scheduled-tasks' && 'menu-item-active'" <a class="menu-item" :class="activeTab === 'scheduled-tasks' && 'menu-item-active'"
@click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'" @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"

8
resources/views/livewire/project/application/heading.blade.php
View File

@@ -1,4 +1,4 @@
<nav wire:poll.5000ms="check_status"> <nav wire:poll.10000ms="check_status">
<x-resources.breadcrumbs :resource="$application" :parameters="$parameters" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" /> <x-resources.breadcrumbs :resource="$application" :parameters="$parameters" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
<div class="navbar-main"> <div class="navbar-main">
<nav class="flex items-center flex-shrink-0 gap-6 scrollbar min-h-10 whitespace-nowrap"> <nav class="flex items-center flex-shrink-0 gap-6 scrollbar min-h-10 whitespace-nowrap">
@@ -23,9 +23,9 @@
<div>Please load a Compose file.</div> <div>Please load a Compose file.</div>
@else @else
@if (!$application->destination->server->isSwarm()) @if (!$application->destination->server->isSwarm())
<div> <div>
<x-applications.advanced :application="$application" /> <x-applications.advanced :application="$application" />
</div> </div>
@endif @endif
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
@if (!str($application->status)->startsWith('exited')) @if (!str($application->status)->startsWith('exited'))

4
resources/views/livewire/project/resource/index.blade.php
View File

@@ -72,6 +72,10 @@
</div> </div>
<div class="max-w-full px-4 truncate box-description" x-text="item.description"></div> <div class="max-w-full px-4 truncate box-description" x-text="item.description"></div>
<div class="max-w-full px-4 truncate box-description" x-text="item.fqdn"></div> <div class="max-w-full px-4 truncate box-description" x-text="item.fqdn"></div>
<template x-if="item.server_status == false">
<div class="px-4 text-xs font-bold text-error">The underlying server has problems
</div>
</template>
</div> </div>
</a> </a>
<div <div

4
resources/views/livewire/project/service/configuration.blade.php
View File

@@ -1,4 +1,4 @@
<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.check_status" wire:poll.5000ms="check_status"> <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.check_status">
<x-slot:title> <x-slot:title>
{{ data_get_str($service, 'name')->limit(10) }} > Configuration | Coolify {{ data_get_str($service, 'name')->limit(10) }} > Configuration | Coolify
</x-slot> </x-slot>
@@ -183,7 +183,7 @@
@endforeach @endforeach
</div> </div>
<div x-cloak x-show="activeTab === 'scheduled-tasks'"> <div x-cloak x-show="activeTab === 'scheduled-tasks'">
<livewire:project.shared.scheduled-task.all :resource="$service" lazy /> <livewire:project.shared.scheduled-task.all :resource="$service" />
</div> </div>
<div x-cloak x-show="activeTab === 'webhooks'"> <div x-cloak x-show="activeTab === 'webhooks'">
<livewire:project.shared.webhooks :resource="$service" /> <livewire:project.shared.webhooks :resource="$service" />

23
resources/views/livewire/project/service/file-storage.blade.php
View File

@@ -14,16 +14,31 @@
<div class="flex gap-2"> <div class="flex gap-2">
@if ($fileStorage->is_directory) @if ($fileStorage->is_directory)
<x-modal-confirmation action="convertToFile" buttonTitle="Convert to file"> <x-modal-confirmation action="convertToFile" buttonTitle="Convert to file">
This will delete all files in this directory. It is not reversible. <br>Please think again. <div>This will delete all files in this directory. It is not reversible. <strong
class="text-error">Please think
again.</strong><br><br></div>
</x-modal-confirmation> </x-modal-confirmation>
@else @else
<x-modal-confirmation action="convertToDirectory" buttonTitle="Convert to directory"> <x-modal-confirmation action="convertToDirectory" buttonTitle="Convert to directory">
This will convert this to a directory. If it was a file, it will be deleted. It is not reversible. <div>This will delete the file and make a directory instead. It is not reversible.
<br>Please think again. <strong class="text-error">Please think
again.</strong><br><br>
</div>
</x-modal-confirmation> </x-modal-confirmation>
@endif @endif
<x-modal-confirmation isErrorButton buttonTitle="Delete"> <x-modal-confirmation isErrorButton buttonTitle="Delete">
This file / directory will be deleted. It is not reversible. <br>Please think again. <div class="px-2">This storage will be deleted. It is not reversible. <strong
class="text-error">Please
think
again.</strong><br><br></div>
<h4>Actions</h4>
@if ($fileStorage->is_directory)
<x-forms.checkbox id="permanently_delete"
label="Permanently delete directory from the server?"></x-forms.checkbox>
@else
<x-forms.checkbox id="permanently_delete"
label="Permanently delete file from the server?"></x-forms.checkbox>
@endif
</x-modal-confirmation> </x-modal-confirmation>
</div> </div>
@if (!$fileStorage->is_directory) @if (!$fileStorage->is_directory)

2
resources/views/livewire/project/service/navbar.blade.php
View File

@@ -1,4 +1,4 @@
<div> <div wire:poll.10000ms="check_status_without_notification">
<livewire:project.shared.configuration-checker :resource="$service" /> <livewire:project.shared.configuration-checker :resource="$service" />
<x-slide-over @startservice.window="slideOverOpen = true" closeWithX fullScreen> <x-slide-over @startservice.window="slideOverOpen = true" closeWithX fullScreen>
<x-slot:title>Service Startup</x-slot:title> <x-slot:title>Service Startup</x-slot:title>

10
resources/views/livewire/project/service/storage.blade.php
View File

@@ -25,7 +25,7 @@
<span class="dark:text-warning text-coollabs">Please modify storage layout in your Docker Compose <span class="dark:text-warning text-coollabs">Please modify storage layout in your Docker Compose
file or reload the compose file to reread the storage layout.</span> file or reload the compose file to reread the storage layout.</span>
@else @else
@if ($resource->persistentStorages()->get()->count() === 0 && $resource->fileStorages()->get()->count() == 0) @if ($resource->persistentStorages()->get()->count() === 0 && $fileStorage->count() == 0)
<div class="pt-4">No storage found.</div> <div class="pt-4">No storage found.</div>
@endif @endif
@endif @endif
@@ -33,9 +33,9 @@
@if ($resource->persistentStorages()->get()->count() > 0) @if ($resource->persistentStorages()->get()->count() > 0)
<livewire:project.shared.storages.all :resource="$resource" /> <livewire:project.shared.storages.all :resource="$resource" />
@endif @endif
@if ($resource->fileStorages()->get()->count() > 0) @if ($fileStorage->count() > 0)
<div class="flex flex-col gap-4 pt-4"> <div class="flex flex-col gap-4 pt-4">
@foreach ($resource->fileStorages()->get()->sort() as $fileStorage) @foreach ($fileStorage->sort() as $fileStorage)
<livewire:project.service.file-storage :fileStorage="$fileStorage" <livewire:project.service.file-storage :fileStorage="$fileStorage"
wire:key="resource-{{ $fileStorage->uuid }}" /> wire:key="resource-{{ $fileStorage->uuid }}" />
@endforeach @endforeach
@@ -48,9 +48,9 @@
@if ($resource->persistentStorages()->get()->count() > 0) @if ($resource->persistentStorages()->get()->count() > 0)
<livewire:project.shared.storages.all :resource="$resource" /> <livewire:project.shared.storages.all :resource="$resource" />
@endif @endif
@if ($resource->fileStorages()->get()->count() > 0) @if ($fileStorage->count() > 0)
<div class="flex flex-col gap-4 pt-4"> <div class="flex flex-col gap-4 pt-4">
@foreach ($resource->fileStorages()->get()->sort() as $fileStorage) @foreach ($fileStorage->sort() as $fileStorage)
<livewire:project.service.file-storage :fileStorage="$fileStorage" <livewire:project.service.file-storage :fileStorage="$fileStorage"
wire:key="resource-{{ $fileStorage->uuid }}" /> wire:key="resource-{{ $fileStorage->uuid }}" />
@endforeach @endforeach

4
resources/views/livewire/project/shared/destination.blade.php
View File

@@ -19,6 +19,9 @@
<div class="box-description"> <div class="box-description">
Network: {{ data_get($resource, 'destination.network') }} Network: {{ data_get($resource, 'destination.network') }}
</div> </div>
@if ($resource->server_status == false)
<div class="text-xs font-bold text-error"> This server has connection problems. </div>
@endif
</div> </div>
@if ($resource?->additional_networks?->count() > 0) @if ($resource?->additional_networks?->count() > 0)
<div class="flex gap-2"> <div class="flex gap-2">
@@ -76,7 +79,6 @@
@if ($resource->getMorphClass() === 'App\Models\Application' && data_get($resource, 'build_pack') !== 'dockercompose') @if ($resource->getMorphClass() === 'App\Models\Application' && data_get($resource, 'build_pack') !== 'dockercompose')
@if (count($networks) > 0) @if (count($networks) > 0)
<h4>Choose another server</h4> <h4>Choose another server</h4>
<div class="pb-4 description">(experimental) </div>
<div class="grid grid-cols-1 gap-4"> <div class="grid grid-cols-1 gap-4">
@foreach ($networks as $network) @foreach ($networks as $network)
<div wire:click="addServer('{{ $network->id }}','{{ data_get($network, 'server.id') }}')" <div wire:click="addServer('{{ $network->id }}','{{ data_get($network, 'server.id') }}')"

2
resources/views/livewire/server/form.blade.php
View File

@@ -68,7 +68,7 @@
</div> </div>
<div class="flex flex-col w-full gap-2 lg:flex-row"> <div class="flex flex-col w-full gap-2 lg:flex-row">
<x-forms.input id="server.ip" label="IP Address/Domain" <x-forms.input type="password" id="server.ip" label="IP Address/Domain"
helper="An IP Address (127.0.0.1) or domain (example.com)." required /> helper="An IP Address (127.0.0.1) or domain (example.com)." required />
<div class="flex gap-2"> <div class="flex gap-2">
<x-forms.input id="server.user" label="User" required /> <x-forms.input id="server.user" label="User" required />

24
resources/views/livewire/server/proxy.blade.php
View File

@@ -1,3 +1,4 @@
@php use App\Enums\ProxyTypes; @endphp
<div> <div>
@if ($server->proxyType()) @if ($server->proxyType())
<div x-init="$wire.loadProxyConfiguration"> <div x-init="$wire.loadProxyConfiguration">
@@ -6,9 +7,9 @@
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Configuration</h2> <h2>Configuration</h2>
@if ($server->proxy->status === 'exited' || $server->proxy->status === 'removing') @if ($server->proxy->status === 'exited' || $server->proxy->status === 'removing')
<x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button> <x-forms.button wire:click.prevent="changeProxy">Switch Proxy</x-forms.button>
@else @else
<x-forms.button disabled wire:click.prevent="change_proxy">Switch Proxy</x-forms.button> <x-forms.button disabled wire:click.prevent="changeProxy">Switch Proxy</x-forms.button>
@endif @endif
<x-forms.button type="submit">Save</x-forms.button> <x-forms.button type="submit">Save</x-forms.button>
@@ -20,7 +21,14 @@
</svg>Before switching proxies, please read <a class="underline dark:text-white" </svg>Before switching proxies, please read <a class="underline dark:text-white"
href="https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies">this</a>. href="https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies">this</a>.
</div> </div>
@if ($server->proxyType() === 'TRAEFIK_V2') <h4>Advanced</h4>
<div class="pb-4 w-96">
<x-forms.checkbox
helper="If set, all resources will only have docker container labels for {{ str($server->proxyType())->title() }}.<br>For applications, labels needs to be regenerated manually. <br>Resources needs to be restarted."
id="server.settings.generate_exact_labels"
label="Generate labels only for {{ str($server->proxyType())->title() }}" instantSave />
</div>
@if ($server->proxyType() === ProxyTypes::TRAEFIK->value)
<h4>Traefik</h4> <h4>Traefik</h4>
@elseif ($server->proxyType() === 'CADDY') @elseif ($server->proxyType() === 'CADDY')
<h4>Caddy</h4> <h4>Caddy</h4>
@@ -52,13 +60,13 @@
@elseif($selectedProxy === 'NONE') @elseif($selectedProxy === 'NONE')
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Configuration</h2> <h2>Configuration</h2>
<x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button> <x-forms.button wire:click.prevent="changeProxy">Switch Proxy</x-forms.button>
</div> </div>
<div class="pt-2 pb-4">Custom (None) Proxy Selected</div> <div class="pt-2 pb-4">Custom (None) Proxy Selected</div>
@else @else
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Configuration</h2> <h2>Configuration</h2>
<x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button> <x-forms.button wire:click.prevent="changeProxy">Switch Proxy</x-forms.button>
</div> </div>
@endif @endif
@else @else
@@ -66,13 +74,13 @@
<h2>Configuration</h2> <h2>Configuration</h2>
<div class="subtitle">Select a proxy you would like to use on this server.</div> <div class="subtitle">Select a proxy you would like to use on this server.</div>
<div class="grid gap-4"> <div class="grid gap-4">
<x-forms.button class="box" wire:click="select_proxy('NONE')"> <x-forms.button class="box" wire:click="selectProxy('NONE')">
Custom (None) Custom (None)
</x-forms.button> </x-forms.button>
<x-forms.button class="box" wire:click="select_proxy('TRAEFIK_V2')"> <x-forms.button class="box" wire:click="selectProxy('TRAEFIK')">
Traefik Traefik
</x-forms.button> </x-forms.button>
<x-forms.button class="box" wire:click="select_proxy('CADDY')"> <x-forms.button class="box" wire:click="selectProxy('CADDY')">
Caddy Caddy
</x-forms.button> </x-forms.button>
<x-forms.button disabled class="box"> <x-forms.button disabled class="box">

6
resources/views/livewire/server/proxy/deploy.blade.php
View File

@@ -1,3 +1,4 @@
@php use App\Enums\ProxyTypes; @endphp
<div> <div>
@if ( @if (
$server->proxyType() !== 'NONE' && $server->proxyType() !== 'NONE' &&
@@ -12,7 +13,10 @@
</x-slide-over> </x-slide-over>
@if (data_get($server, 'proxy.status') === 'running') @if (data_get($server, 'proxy.status') === 'running')
<div class="flex gap-2"> <div class="flex gap-2">
@if ($currentRoute === 'server.proxy' && $traefikDashboardAvailable && $server->proxyType() === 'TRAEFIK_V2') @if (
$currentRoute === 'server.proxy' &&
$traefikDashboardAvailable &&
$server->proxyType() === ProxyTypes::TRAEFIK->value)
<button> <button>
<a target="_blank" href="http://{{ $serverIp }}:8080"> <a target="_blank" href="http://{{ $serverIp }}:8080">
Traefik Dashboard Traefik Dashboard

6
resources/views/livewire/settings/backup.blade.php → resources/views/livewire/settings-backup.blade.php
View File

@@ -1,4 +1,8 @@
<div> <div>
<x-slot:title>
Settings | Coolify
</x-slot>
<x-settings.navbar />
<div class="flex flex-col"> <div class="flex flex-col">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Backup</h2> <h2>Backup</h2>
@@ -8,7 +12,7 @@
</x-forms.button> </x-forms.button>
@endif @endif
</div> </div>
<div class="pb-4">Backup your Coolify instance settings</div> <div class="pb-4">Backup configuration for Coolify instance.</div>
<div> <div>
@if (isset($database)) @if (isset($database))
<div class="flex flex-col gap-3 pb-4"> <div class="flex flex-col gap-3 pb-4">

4
resources/views/livewire/settings/email.blade.php → resources/views/livewire/settings-email.blade.php
View File

@@ -1,4 +1,8 @@
<div> <div>
<x-slot:title>
Settings | Coolify
</x-slot>
<x-settings.navbar />
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Transactional Email</h2> <h2>Transactional Email</h2>
</div> </div>

22
resources/views/livewire/settings/auth.blade.php → resources/views/livewire/settings-oauth.blade.php
View File

@@ -1,4 +1,8 @@
<div> <div>
<x-slot:title>
Settings | Coolify
</x-slot>
<x-settings.navbar />
<form wire:submit='submit' class="flex flex-col"> <form wire:submit='submit' class="flex flex-col">
<div class="flex flex-col"> <div class="flex flex-col">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
@@ -7,20 +11,26 @@
Save Save
</x-forms.button> </x-forms.button>
</div> </div>
<div class="pb-4 ">Custom authentication (OAuth) configurations.</div>
</div> </div>
<div class="flex flex-col gap-2 pt-4"> <div class="flex flex-col gap-2 pt-4">
@foreach ($oauth_settings_map as $oauth_setting) @foreach ($oauth_settings_map as $oauth_setting)
<div class="p-4 border dark:border-coolgray-300"> <div class="p-4 border dark:border-coolgray-300">
<h3>{{ucfirst($oauth_setting->provider)}} Oauth</h3> <h3>{{ ucfirst($oauth_setting->provider) }} Oauth</h3>
<div class="w-32"> <div class="w-32">
<x-forms.checkbox instantSave id="oauth_settings_map.{{$oauth_setting->provider}}.enabled" label="Enabled" /> <x-forms.checkbox instantSave id="oauth_settings_map.{{ $oauth_setting->provider }}.enabled"
label="Enabled" />
</div> </div>
<div class="flex flex-col w-full gap-2 xl:flex-row"> <div class="flex flex-col w-full gap-2 xl:flex-row">
<x-forms.input id="oauth_settings_map.{{$oauth_setting->provider}}.client_id" label="Client ID" /> <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.client_id"
<x-forms.input id="oauth_settings_map.{{$oauth_setting->provider}}.client_secret" type="password" label="Client Secret" /> label="Client ID" />
<x-forms.input id="oauth_settings_map.{{$oauth_setting->provider}}.redirect_uri" label="Redirect URI" /> <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.client_secret"
type="password" label="Client Secret" />
<x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.redirect_uri"
label="Redirect URI" />
@if ($oauth_setting->provider == 'azure') @if ($oauth_setting->provider == 'azure')
<x-forms.input id="oauth_settings_map.{{$oauth_setting->provider}}.tenant" label="Tenant" /> <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.tenant"
label="Tenant" />
@endif @endif
</div> </div>
</div> </div>

49
resources/views/livewire/settings/configuration.blade.php
View File

@@ -1,49 +0,0 @@
<div>
<form wire:submit='submit' class="flex flex-col">
<div class="flex items-center gap-2">
<h2>Configuration</h2>
<x-forms.button type="submit">
Save
</x-forms.button>
</div>
<div>General configuration for your Coolify instance.</div>
<div class="flex flex-col gap-2 pt-4">
<div class="flex flex-wrap items-end gap-2">
<x-forms.input id="settings.fqdn" label="Instance's Domain" placeholder="https://coolify.io" />
<x-forms.input id="settings.instance_name" label="Instance's Name" placeholder="Coolify" />
<x-forms.input id="settings.custom_dns_servers" label="DNS Servers"
helper="DNS servers for validation FQDNs againts. A comma separated list of DNS servers."
placeholder="1.1.1.1,8.8.8.8" />
<div class="md:w-96">
<x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Validate DNS settings?" />
</div>
</div>
{{-- <div class="flex gap-2 ">
<x-forms.input type="number" id="settings.public_port_min" label="Public Port Min" />
<x-forms.input type="number" id="settings.public_port_max" label="Public Port Max" />
</div> --}}
</div>
<h2 class="pt-6">API</h2>
<div class="md:w-96">
<x-forms.checkbox instantSave id="is_api_enabled" label="Enabled" />
</div>
<x-forms.input id="settings.allowed_ips" label="Allowed IPs"
helper="Allowed IP lists for the API. A comma separated list of IPs. Empty means you allow from everywhere."
placeholder="1.1.1.1,8.8.8.8" />
</form>
<h2 class="pt-6">Advanced</h2>
<div class="text-right md:w-96">
@if (!is_null(env('AUTOUPDATE', null)))
<x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled
id="is_auto_update_enabled" label="Auto Update Coolify" />
@else
<x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
@endif
<x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
<x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
</div>
</div>

90
resources/views/livewire/settings/index.blade.php
View File

@@ -3,32 +3,72 @@
Settings | Coolify Settings | Coolify
</x-slot> </x-slot>
<x-settings.navbar /> <x-settings.navbar />
<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 pt-1 sm:flex-row"> <form wire:submit='submit' class="flex flex-col">
<div class="flex gap-6 overflow-x-scroll sm:gap-2 sm:overflow-x-hidden scrollbar sm:flex-col whitespace-nowrap"> <div class="flex items-center gap-2">
<a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'" <h2>Configuration</h2>
@click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a> <x-forms.button type="submit">
<a class="menu-item" :class="activeTab === 'backup' && 'menu-item-active'" Save
@click.prevent="activeTab = 'backup'; window.location.hash = 'backup'" href="#">Instance Backup</a> </x-forms.button>
<a class="menu-item" :class="activeTab === 'smtp' && 'menu-item-active'"
@click.prevent="activeTab = 'smtp'; window.location.hash = 'smtp'" href="#">Transactional
Email</a>
<a class="menu-item" :class="activeTab === 'auth' && 'menu-item-active'"
@click.prevent="activeTab = 'auth'; window.location.hash = 'auth'" href="#">Authentication
(OAuth)</a>
</div> </div>
<div class="w-full"> <div>General configuration for your Coolify instance.</div>
<div x-cloak x-show="activeTab === 'general'" class="h-full">
<livewire:settings.configuration :settings="$settings" /> <div class="flex flex-col gap-2">
</div> <div class="flex flex-wrap items-end gap-2">
<div x-cloak x-show="activeTab === 'backup'" class="h-full"> <h4 class="pt-6">Instance Settings</h4>
<livewire:settings.backup :settings="$settings" :database="$database" :s3s="$s3s" /> <x-forms.input id="settings.fqdn" label="Instance's Domain" placeholder="https://coolify.io" />
</div> <x-forms.input id="settings.instance_name" label="Instance's Name" placeholder="Coolify" />
<div x-cloak x-show="activeTab === 'smtp'" class="h-full"> <h4 class="w-full pt-6">DNS Validation</h4>
<livewire:settings.email :settings="$settings" /> <div class="md:w-96">
</div> <x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Enabled" />
<div x-cloak x-show="activeTab === 'auth'" class="h-full"> </div>
<livewire:settings.auth /> <x-forms.input id="settings.custom_dns_servers" label="DNS Servers"
helper="DNS servers for validation FQDNs againts. A comma separated list of DNS servers."
placeholder="1.1.1.1,8.8.8.8" />
</div> </div>
{{-- <div class="flex gap-2 ">
<x-forms.input type="number" id="settings.public_port_min" label="Public Port Min" />
<x-forms.input type="number" id="settings.public_port_max" label="Public Port Max" />
</div> --}}
</div> </div>
</div> <h4 class="pt-6">API</h4>
<div class="md:w-96">
<x-forms.checkbox instantSave id="is_api_enabled" label="Enabled" />
</div>
<x-forms.input id="settings.allowed_ips" label="Allowed IPs"
helper="Allowed IP lists for the API. A comma separated list of IPs. Empty means you allow from everywhere."
placeholder="1.1.1.1,8.8.8.8" />
<h4 class="pt-6">Advanced</h4>
<div class="text-right md:w-96">
<x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
<x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
</div>
<h5 class="pt-4 font-bold text-white">Update</h5>
<div class="text-right md:w-96">
@if (!is_null(env('AUTOUPDATE', null)))
<div class="text-right md:w-96">
<x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there."
disabled id="is_auto_update_enabled" label="Enabled" />
</div>
@else
<x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Enabled" />
@endif
</div>
<div class="flex flex-col gap-2">
<div class="flex items-end gap-2">
<x-forms.input required id="update_check_frequency" label="Update Check Frequency"
placeholder="0 * * * *"
helper="Cron expression for update check frequency (check for new Coolify versions and pull new Service Templates from CDN). Default is every hour." />
<x-forms.button wire:click='checkManually'>Check Manually</x-forms.button>
</div>
@if (is_null(env('AUTOUPDATE', null)) && $is_auto_update_enabled)
<x-forms.input required id="auto_update_frequency" label="Auto Update Frequency" placeholder="0 0 * * *"
helper="Cron expression for auto update frequency (automatically update coolify). Default is every day at 00:00" />
@endif
</div>
</form>
</div> </div>

6
routes/web.php
View File

@@ -45,6 +45,9 @@ use App\Livewire\Server\Resources as ResourcesShow;
use App\Livewire\Server\Show as ServerShow; use App\Livewire\Server\Show as ServerShow;
use App\Livewire\Settings\Index as SettingsIndex; use App\Livewire\Settings\Index as SettingsIndex;
use App\Livewire\Settings\License as SettingsLicense; use App\Livewire\Settings\License as SettingsLicense;
use App\Livewire\SettingsBackup;
use App\Livewire\SettingsEmail;
use App\Livewire\SettingsOauth;
use App\Livewire\SharedVariables\Environment\Index as EnvironmentSharedVariablesIndex; use App\Livewire\SharedVariables\Environment\Index as EnvironmentSharedVariablesIndex;
use App\Livewire\SharedVariables\Environment\Show as EnvironmentSharedVariablesShow; use App\Livewire\SharedVariables\Environment\Show as EnvironmentSharedVariablesShow;
use App\Livewire\SharedVariables\Index as SharedVariablesIndex; use App\Livewire\SharedVariables\Index as SharedVariablesIndex;
@@ -113,6 +116,9 @@ Route::middleware(['auth', 'verified'])->group(function () {
Route::get('/subscription/new', SubscriptionIndex::class)->name('subscription.index'); Route::get('/subscription/new', SubscriptionIndex::class)->name('subscription.index');
Route::get('/settings', SettingsIndex::class)->name('settings.index'); Route::get('/settings', SettingsIndex::class)->name('settings.index');
Route::get('/settings/backup', SettingsBackup::class)->name('settings.backup');
Route::get('/settings/email', SettingsEmail::class)->name('settings.email');
Route::get('/settings/oauth', SettingsOauth::class)->name('settings.oauth');
Route::get('/settings/license', SettingsLicense::class)->name('settings.license'); Route::get('/settings/license', SettingsLicense::class)->name('settings.license');
Route::get('/profile', ProfileIndex::class)->name('profile'); Route::get('/profile', ProfileIndex::class)->name('profile');

2
templates/compose/directus-with-postgresql.yaml
View File

@@ -36,7 +36,7 @@ services:
redis: redis:
condition: service_healthy condition: service_healthy
postgresql: postgresql:
image: postgres:16-alpine image: postgis/postgis:16-3.4-alpine
volumes: volumes:
- directus-postgresql-data:/var/lib/postgresql/data - directus-postgresql-data:/var/lib/postgresql/data
environment: environment:

50
templates/compose/formbricks.yaml
View File

@@ -1,6 +1,6 @@
# documentation: https://formbricks.com # documentation: https://formbricks.com/docs/self-hosting/configuration
# slogan: Open Source Experience Management # slogan: Open Source Survey Platform
# tags: form, builder, forms, open source, experience, management, self-hosted, docker # tags: form, builder, forms, survey, open source, experience, management, self-hosted, docker
# logo: svgs/formbricks.png # logo: svgs/formbricks.png
# port: 3000 # port: 3000
@@ -11,33 +11,55 @@ services:
- SERVICE_FQDN_FORMBRICKS_3000 - SERVICE_FQDN_FORMBRICKS_3000
- WEBAPP_URL=$SERVICE_FQDN_FORMBRICKS - WEBAPP_URL=$SERVICE_FQDN_FORMBRICKS
- DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgresql:5432/${POSTGRESQL_DATABASE:-formbricks} - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgresql:5432/${POSTGRESQL_DATABASE:-formbricks}
- POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
- NEXTAUTH_SECRET=$SERVICE_BASE64_64_NEXTAUTH - NEXTAUTH_SECRET=$SERVICE_BASE64_64_NEXTAUTH
- NEXTAUTH_URL=$SERVICE_FQDN_FORMBRICKS - NEXTAUTH_URL=$SERVICE_FQDN_FORMBRICKS
- ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION - ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION
- POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL} - CRON_SECRET=$SERVICE_BASE64_64_CRON
- ENTERPRISE_LICENSE_KEY=${ENTERPRISE_LICENSE_KEY}
- MAIL_FROM=${MAIL_FROM:-test@example.com} - MAIL_FROM=${MAIL_FROM:-test@example.com}
- SMTP_HOST=${SMTP_HOST:-test.example.com} - SMTP_HOST=${SMTP_HOST:-test.example.com}
- SMTP_PORT=${SMTP_PORT:-587} - SMTP_PORT=${SMTP_PORT:-587}
- SMTP_USER=${SMTP_USER:-test} - SMTP_USER=${SMTP_USER:-test}
- SMTP_PASSWORD=${SMTP_PASSWORD:-test} - SMTP_PASSWORD=${SMTP_PASSWORD:-test}
- SMTP_SECURE_ENABLED=${SMTP_SECURE_ENABLED:-0} - SMTP_SECURE_ENABLED=${SMTP_SECURE_ENABLED:-0}
- SMTP_REJECT_UNAUTHORIZED_TLS=${SMTP_REJECT_UNAUTHORIZED_TLS:-1}
- SHORT_URL_BASE=${SHORT_URL_BASE} - SHORT_URL_BASE=${SHORT_URL_BASE}
- EMAIL_VERIFICATION_DISABLED=${EMAIL_VERIFICATION_DISABLED:-1} - EMAIL_VERIFICATION_DISABLED=${EMAIL_VERIFICATION_DISABLED:-1}
- PASSWORD_RESET_DISABLED=${PASSWORD_RESET_DISABLED:-1} - PASSWORD_RESET_DISABLED=${PASSWORD_RESET_DISABLED:-1}
- SIGNUP_DISABLED=${SIGNUP_DISABLED:-0} - EMAIL_AUTH_DISABLED=${EMAIL_AUTH_DISABLED:-0}
- INVITE_DISABLED=${INVITE_DISABLED:-0} - INVITE_DISABLED=${INVITE_DISABLED:-0}
- ASSET_PREFIX_URL=${ASSET_PREFIX_URL}
- UNSPLASH_ACCESS_KEY=${UNSPLASH_ACCESS_KEY}
- GITHUB_ID=${GITHUB_ID}
- GITHUB_SECRET=${GITHUB_SECRET}
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
- AZUREAD_CLIENT_ID=${AZUREAD_CLIENT_ID}
- AZUREAD_CLIENT_SECRET=${AZUREAD_CLIENT_SECRET}
- AZUREAD_TENANT_ID=${AZUREAD_TENANT_ID}
- OIDC_CLIENT_ID=${OIDC_CLIENT_ID}
- OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET}
- OIDC_ISSUER=${OIDC_ISSUER}
- OIDC_DISPLAY_NAME=${OIDC_DISPLAY_NAME}
- OIDC_SIGNING_ALGORITHM=${OIDC_SIGNING_ALGORITHM}
- NOTION_OAUTH_CLIENT_ID=${NOTION_OAUTH_CLIENT_ID}
- NOTION_OAUTH_CLIENT_SECRET=${NOTION_OAUTH_CLIENT_SECRET}
- GOOGLE_SHEETS_CLIENT_ID=${GOOGLE_SHEETS_CLIENT_ID}
- GOOGLE_SHEETS_CLIENT_SECRET=${GOOGLE_SHEETS_CLIENT_SECRET}
- GOOGLE_SHEETS_REDIRECT_URL=${GOOGLE_SHEETS_REDIRECT_URL}
- AIRTABLE_CLIENT_ID=${AIRTABLE_CLIENT_ID}
- SLACK_CLIENT_ID=${SLACK_CLIENT_ID}
- SLACK_CLIENT_SECRET=${SLACK_CLIENT_SECRET}
- PRIVACY_URL=${PRIVACY_URL} - PRIVACY_URL=${PRIVACY_URL}
- TERMS_URL=${TERMS_URL} - TERMS_URL=${TERMS_URL}
- IMPRINT_URL=${IMPRINT_URL} - IMPRINT_URL=${IMPRINT_URL}
- GITHUB_AUTH_ENABLED=${GITHUB_AUTH_ENABLED:-0} - RATE_LIMITING_DISABLED=${RATE_LIMITING_DISABLED:-0}
- GITHUB_ID=${GITHUB_ID} - OPENTELEMETRY_LISTENER_URL=${OPENTELEMETRY_LISTENER_URL}
- GITHUB_SECRET=${GITHUB_SECRET} - REDIS_URL=${REDIS_URL}
- GOOGLE_AUTH_ENABLED=${GOOGLE_AUTH_ENABLED:-0} - REDIS_HTTP_URL=${REDIS_HTTP_URL}
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID} - DEFAULT_ORGANIZATION_ID=${DEFAULT_ORGANIZATION_ID}
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET} - DEFAULT_ORGANIZATION_ROLE=${DEFAULT_ORGANIZATION_ROLE:-admin}
- ASSET_PREFIX_URL=${ASSET_PREFIX_URL}
- CRON_SECRET=$SERVICE_BASE64_64_CRON
- ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION
volumes: volumes:
- formbricks-uploads:/apps/web/uploads/ - formbricks-uploads:/apps/web/uploads/
depends_on: depends_on:

112
templates/compose/homepage.yaml
View File

@@ -11,6 +11,112 @@ services:
- SERVICE_FQDN_HOMEPAGE_3000 - SERVICE_FQDN_HOMEPAGE_3000
- HOMEPAGE_VAR_BASE=${SERVICE_FQDN_HOMEPAGE} - HOMEPAGE_VAR_BASE=${SERVICE_FQDN_HOMEPAGE}
volumes: volumes:
- homepage-config:/app/config - /var/run/docker.sock:/var/run/docker.sock:ro
- homepage-images:/app/public/images - ./images:/app/public/images
- /var/run/docker.sock:/var/run/docker.sock
- type: bind
source: ./config/bookmarks.yaml
target: /app/config/bookmarks.yaml
content: |
---
# For configuration options and examples, please see:
# https://gethomepage.dev/latest/configs/bookmarks
- Developer:
- Github:
- abbr: GH
href: https://github.com/
- Social:
- Reddit:
- abbr: RE
href: https://reddit.com/
- Entertainment:
- YouTube:
- abbr: YT
href: https://youtube.com/
- type: bind
source: ./config/custom.css
target: /app/config/custom.css
content: ""
- type: bind
source: ./config/custom.js
target: /app/config/custom.js
content: ""
- type: bind
source: ./config/docker.yaml
target: /app/config/docker.yaml
content: |
---
# For configuration options and examples, please see:
# https://gethomepage.dev/latest/configs/docker/
# my-docker:
# host: 127.0.0.1
# port: 2375
# my-docker:
# socket: /var/run/docker.sock
- type: bind
source: ./config/kubernetes.yaml
target: /app/config/kubernetes.yaml
content: |
---
# sample kubernetes config
- type: bind
source: ./config/services.yaml
target: /app/config/services.yaml
content: |
---
# For configuration options and examples, please see:
# https://gethomepage.dev/latest/configs/services
- My First Group:
- My First Service:
href: http://localhost/
description: Homepage is awesome
- My Second Group:
- My Second Service:
href: http://localhost/
description: Homepage is the best
- My Third Group:
- My Third Service:
href: http://localhost/
description: Homepage is 😎
- type: bind
source: ./config/settings.yaml
target: /app/config/settings.yaml
content: |
---
# For configuration options and examples, please see:
# https://gethomepage.dev/latest/configs/settings
providers:
openweathermap: openweathermapapikey
weatherapi: weatherapiapikey
- type: bind
source: ./config/widgets.yaml
target: /app/config/widgets.yaml
content: |
---
# For configuration options and examples, please see:
# https://gethomepage.dev/latest/configs/service-widgets
- resources:
cpu: true
memory: true
disk: /
- search:
provider: duckduckgo
target: _blank

48
templates/compose/minecraft.yaml Normal file
View File

@@ -0,0 +1,48 @@
# documentation: https://github.com/itzg/docker-minecraft-server
# slogan: Minecraft Server that will automatically download selected version at startup.
# tags: minecraft
# logo: svgs/minecraft.svg
# port: 25565
services:
mc:
image: itzg/minecraft-server
ports:
- ${PORT}:25565
environment:
- EULA=true
- VERSION=${MINECRAFT_VERSION:-latest}
- TYPE=${MINECRAFT_TYPE:-VANILLA}
- SERVER_NAME=${MINECRAFT_SERVER_NAME:-Minecraft Server}
- MOTD=${MINECRAFT_MOTD:-Minecraft Server powered by §aCoolify§r}
- DIFFICULTY=${MINECRAFT_DIFFICULTY:-normal}
- MAX_PLAYERS=${MINECRAFT_MAX_PLAYERS:-10}
- MAX_WORLD_SIZE=${MINECRAFT_MAX_WORLD_SIZE:-10000}
- VIEW_DISTANCE=${MINECRAFT_VIEW_DISTANCE:-10}
- MAX_BUILD_HEIGHT=${MINECRAFT_MAX_BUILD_HEIGHT:-256}
- MAX_TICK_TIME=${MINECRAFT_MAX_TICK_TIME:-60000}
- ALLOW_NETHER=${MINECRAFT_ALLOW_NETHER:-true}
- ANNOUNCE_PLAYER_ACHIEVEMENTS=${MINECRAFT_ANNOUNCE_PLAYER_ACHIEVEMENTS:-true}
- GENERATE_STRUCTURES=${MINECRAFT_GENERATE_STRUCTURES:-true}
- PVP=${MINECRAFT_PVP:-true}
- FORCE_GAMEMODE=${MINECRAFT_FORCE_GAMEMODE:-false}
- HARDCORE=${MINECRAFT_HARDCORE:-false}
- ENABLE_COMMAND_BLOCK=${MINECRAFT_ENABLE_COMMAND_BLOCK:-false}
- SPAWN_ANIMALS=${MINECRAFT_SPAWN_ANIMALS:-true}
- SPAWN_MONSTERS=${MINECRAFT_SPAWN_MONSTERS:-true}
- SPAWN_NPCS=${MINECRAFT_SPAWN_NPCS:-true}
- SNOOPER_ENABLED=${MINECRAFT_SNOOPER_ENABLED:-true}
- ONLINE_MODE=${MINECRAFT_ONLINE_MODE:-true}
- PLAYER_IDLE_TIMEOUT=${MINECRAFT_PLAYER_IDLE_TIMEOUT:-0}
- MEMORY=${MINECRAFT_MEMORY:-1G}
- ENABLE_AUTOPAUSE=${MINECRAFT_ENABLE_AUTOPAUSE:-false}
- RCON_PASSWORD=${SERVICE_PASSWORD_RCON}
- PORT=${PORT:-25565}
volumes:
- ./minecraft-data:/data
healthcheck:
test:
["CMD", "/usr/local/bin/mc-monitor", "status", "--host", "localhost"]
interval: 2s
timeout: 10s
retries: 15

4
templates/compose/plausible.yaml
View File

@@ -6,13 +6,13 @@
services: services:
plausible: plausible:
image: "ghcr.io/plausible/community-edition:v2.1.0" image: "ghcr.io/plausible/community-edition:v2.1"
command: 'sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"' command: 'sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"'
environment: environment:
- "DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible" - "DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible"
- BASE_URL=$SERVICE_FQDN_PLAUSIBLE - BASE_URL=$SERVICE_FQDN_PLAUSIBLE
- SECRET_KEY_BASE=$SERVICE_BASE64_64_PLAUSIBLE - SECRET_KEY_BASE=$SERVICE_BASE64_64_PLAUSIBLE
- TOTP_VAULT_KEY=$SERVICE_BASE64_TOTP - TOTP_VAULT_KEY=$SERVICE_REALBASE64_32_TOTP
depends_on: depends_on:
- plausible_db - plausible_db
- plausible_events_db - plausible_events_db

2
templates/service-templates.json
View File

File diff suppressed because one or more lines are too long