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

Merge pull request #2164 from coollabsio/next

Browse Source 
v4.0.0-beta.277
This commit is contained in:
Andras Bacsai
2024-05-10 10:50:40 +02:00
committed by GitHub
parent 94acd12f1c 7f265a6692
commit b528a0f4ec
61 changed files with 1500 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Actions/Database/StartClickhouse.php
View File

@@ -33,7 +33,6 @@ class StartClickhouse
$environment_variables = $this->generate_environment_variables(); $environment_variables = $this->generate_environment_variables();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,

1
app/Actions/Database/StartDatabaseProxy.php
View File

@@ -107,7 +107,6 @@ class StartDatabaseProxy
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
EOF; EOF;
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$proxyContainerName => [ $proxyContainerName => [
'build' => [ 'build' => [

1
app/Actions/Database/StartDragonfly.php
View File

@@ -36,7 +36,6 @@ class StartDragonfly
$environment_variables = $this->generate_environment_variables(); $environment_variables = $this->generate_environment_variables();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,

5
app/Actions/Database/StartKeydb.php
View File

@@ -37,7 +37,6 @@ class StartKeydb
$this->add_custom_keydb(); $this->add_custom_keydb();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,
@@ -96,7 +95,7 @@ class StartKeydb
if (count($volume_names) > 0) { if (count($volume_names) > 0) {
$docker_compose['volumes'] = $volume_names; $docker_compose['volumes'] = $volume_names;
} }
if (!is_null($this->database->keydb_conf)) { if (!is_null($this->database->keydb_conf) || !empty($this->database->keydb_conf)) {
$docker_compose['services'][$container_name]['volumes'][] = [ $docker_compose['services'][$container_name]['volumes'][] = [
'type' => 'bind', 'type' => 'bind',
'source' => $this->configuration_dir . '/keydb.conf', 'source' => $this->configuration_dir . '/keydb.conf',
@@ -162,7 +161,7 @@ class StartKeydb
} }
private function add_custom_keydb() private function add_custom_keydb()
{ {
if (is_null($this->database->keydb_conf)) { if (is_null($this->database->keydb_conf) || empty($this->database->keydb_conf)) {
return; return;
} }
$filename = 'keydb.conf'; $filename = 'keydb.conf';

5
app/Actions/Database/StartMariadb.php
View File

@@ -32,7 +32,6 @@ class StartMariadb
$environment_variables = $this->generate_environment_variables(); $environment_variables = $this->generate_environment_variables();
$this->add_custom_mysql(); $this->add_custom_mysql();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,
@@ -90,7 +89,7 @@ class StartMariadb
if (count($volume_names) > 0) { if (count($volume_names) > 0) {
$docker_compose['volumes'] = $volume_names; $docker_compose['volumes'] = $volume_names;
} }
if (!is_null($this->database->mariadb_conf)) { if (!is_null($this->database->mariadb_conf) || !empty($this->database->mariadb_conf)) {
$docker_compose['services'][$container_name]['volumes'][] = [ $docker_compose['services'][$container_name]['volumes'][] = [
'type' => 'bind', 'type' => 'bind',
'source' => $this->configuration_dir . '/custom-config.cnf', 'source' => $this->configuration_dir . '/custom-config.cnf',
@@ -165,7 +164,7 @@ class StartMariadb
} }
private function add_custom_mysql() private function add_custom_mysql()
{ {
if (is_null($this->database->mariadb_conf)) { if (is_null($this->database->mariadb_conf) || empty($this->database->mariadb_conf)) {
return; return;
} }
$filename = 'custom-config.cnf'; $filename = 'custom-config.cnf';

5
app/Actions/Database/StartMongodb.php
View File

@@ -35,7 +35,6 @@ class StartMongodb
$this->add_custom_mongo_conf(); $this->add_custom_mongo_conf();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,
@@ -97,7 +96,7 @@ class StartMongodb
if (count($volume_names) > 0) { if (count($volume_names) > 0) {
$docker_compose['volumes'] = $volume_names; $docker_compose['volumes'] = $volume_names;
} }
if (!is_null($this->database->mongo_conf)) { if (!is_null($this->database->mongo_conf) || !empty($this->database->mongo_conf)) {
$docker_compose['services'][$container_name]['volumes'][] = [ $docker_compose['services'][$container_name]['volumes'][] = [
'type' => 'bind', 'type' => 'bind',
'source' => $this->configuration_dir . '/mongod.conf', 'source' => $this->configuration_dir . '/mongod.conf',
@@ -178,7 +177,7 @@ class StartMongodb
} }
private function add_custom_mongo_conf() private function add_custom_mongo_conf()
{ {
if (is_null($this->database->mongo_conf)) { if (is_null($this->database->mongo_conf) || empty($this->database->mongo_conf)) {
return; return;
} }
$filename = 'mongod.conf'; $filename = 'mongod.conf';

5
app/Actions/Database/StartMysql.php
View File

@@ -32,7 +32,6 @@ class StartMysql
$environment_variables = $this->generate_environment_variables(); $environment_variables = $this->generate_environment_variables();
$this->add_custom_mysql(); $this->add_custom_mysql();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,
@@ -90,7 +89,7 @@ class StartMysql
if (count($volume_names) > 0) { if (count($volume_names) > 0) {
$docker_compose['volumes'] = $volume_names; $docker_compose['volumes'] = $volume_names;
} }
if (!is_null($this->database->mysql_conf)) { if (!is_null($this->database->mysql_conf) || !empty($this->database->mysql_conf)) {
$docker_compose['services'][$container_name]['volumes'][] = [ $docker_compose['services'][$container_name]['volumes'][] = [
'type' => 'bind', 'type' => 'bind',
'source' => $this->configuration_dir . '/custom-config.cnf', 'source' => $this->configuration_dir . '/custom-config.cnf',
@@ -165,7 +164,7 @@ class StartMysql
} }
private function add_custom_mysql() private function add_custom_mysql()
{ {
if (is_null($this->database->mysql_conf)) { if (is_null($this->database->mysql_conf) || empty($this->database->mysql_conf)) {
return; return;
} }
$filename = 'custom-config.cnf'; $filename = 'custom-config.cnf';

13
app/Actions/Database/StartPostgresql.php
View File

@@ -35,7 +35,6 @@ class StartPostgresql
$this->add_custom_conf(); $this->add_custom_conf();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,
@@ -78,7 +77,6 @@ class StartPostgresql
data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
} }
if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
ray('Log Drain Enabled');
$docker_compose['services'][$container_name]['logging'] = [ $docker_compose['services'][$container_name]['logging'] = [
'driver' => 'fluentd', 'driver' => 'fluentd',
'options' => [ 'options' => [
@@ -107,7 +105,7 @@ class StartPostgresql
]; ];
} }
} }
if (!is_null($this->database->postgres_conf)) { if (!is_null($this->database->postgres_conf) && !empty($this->database->postgres_conf)) {
$docker_compose['services'][$container_name]['volumes'][] = [ $docker_compose['services'][$container_name]['volumes'][] = [
'type' => 'bind', 'type' => 'bind',
'source' => $this->configuration_dir . '/custom-postgres.conf', 'source' => $this->configuration_dir . '/custom-postgres.conf',
@@ -165,8 +163,6 @@ class StartPostgresql
private function generate_environment_variables() private function generate_environment_variables()
{ {
$environment_variables = collect(); $environment_variables = collect();
ray('Generate Environment Variables')->green();
ray($this->database->runtime_environment_variables)->green();
foreach ($this->database->runtime_environment_variables as $env) { foreach ($this->database->runtime_environment_variables as $env) {
$environment_variables->push("$env->key=$env->real_value"); $environment_variables->push("$env->key=$env->real_value");
} }
@@ -203,11 +199,16 @@ class StartPostgresql
} }
private function add_custom_conf() private function add_custom_conf()
{ {
if (is_null($this->database->postgres_conf)) { if (is_null($this->database->postgres_conf) || empty($this->database->postgres_conf)) {
return; return;
} }
$filename = 'custom-postgres.conf'; $filename = 'custom-postgres.conf';
$content = $this->database->postgres_conf; $content = $this->database->postgres_conf;
if (!str($content)->contains('listen_addresses')) {
$content .= "\nlisten_addresses = '*'";
$this->database->postgres_conf = $content;
$this->database->save();
}
$content_base64 = base64_encode($content); $content_base64 = base64_encode($content);
$this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null"; $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
} }

5
app/Actions/Database/StartRedis.php
View File

@@ -37,7 +37,6 @@ class StartRedis
$this->add_custom_redis(); $this->add_custom_redis();
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$container_name => [ $container_name => [
'image' => $this->database->image, 'image' => $this->database->image,
@@ -100,7 +99,7 @@ class StartRedis
if (count($volume_names) > 0) { if (count($volume_names) > 0) {
$docker_compose['volumes'] = $volume_names; $docker_compose['volumes'] = $volume_names;
} }
if (!is_null($this->database->redis_conf)) { if (!is_null($this->database->redis_conf) || !empty($this->database->redis_conf)) {
$docker_compose['services'][$container_name]['volumes'][] = [ $docker_compose['services'][$container_name]['volumes'][] = [
'type' => 'bind', 'type' => 'bind',
'source' => $this->configuration_dir . '/redis.conf', 'source' => $this->configuration_dir . '/redis.conf',
@@ -166,7 +165,7 @@ class StartRedis
} }
private function add_custom_redis() private function add_custom_redis()
{ {
if (is_null($this->database->redis_conf)) { if (is_null($this->database->redis_conf) || empty($this->database->redis_conf)) {
return; return;
} }
$filename = 'redis.conf'; $filename = 'redis.conf';

657
app/Actions/Docker/GetContainersStatus.php Normal file
View File

@@ -0,0 +1,657 @@
<?php
namespace App\Actions\Docker;
use App\Actions\Database\StartDatabaseProxy;
use App\Actions\Proxy\CheckProxy;
use App\Actions\Proxy\StartProxy;
use App\Actions\Shared\ComplexStatusCheck;
use App\Models\Application;
use App\Models\ApplicationPreview;
use App\Models\Server;
use App\Models\ServiceDatabase;
use App\Notifications\Container\ContainerRestarted;
use App\Notifications\Container\ContainerStopped;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Log;
use Lorisleiva\Actions\Concerns\AsAction;
class GetContainersStatus
{
use AsAction;
public $applications;
public $server;
public function handle(Server $server)
{
if (isDev()) {
$server = Server::find(0);
}
$this->server = $server;
if (!$this->server->isFunctional()) {
return 'Server is not ready.';
};
$this->applications = $this->server->applications();
$skip_these_applications = collect([]);
foreach ($this->applications as $application) {
if ($application->additional_servers->count() > 0) {
$skip_these_applications->push($application);
ComplexStatusCheck::run($application);
$this->applications = $this->applications->filter(function ($value, $key) use ($application) {
return $value->id !== $application->id;
});
}
}
$this->applications = $this->applications->filter(function ($value, $key) use ($skip_these_applications) {
return !$skip_these_applications->pluck('id')->contains($value->id);
});
$this->old_way();
// if ($this->server->isSwarm()) {
// $this->old_way();
// } else {
// if (!$this->server->is_metrics_enabled) {
// $this->old_way();
// return;
// }
// $sentinel_found = instant_remote_process(["docker inspect coolify-sentinel"], $this->server, false);
// $sentinel_found = json_decode($sentinel_found, true);
// $status = data_get($sentinel_found, '0.State.Status', 'exited');
// if ($status === 'running') {
// ray('Checking with Sentinel');
// $this->sentinel();
// } else {
// ray('Checking the Old way');
// $this->old_way();
// }
// }
}
private function sentinel()
{
try {
$containers = $this->server->getContainers();
if ($containers->count() === 0) {
return;
}
$databases = $this->server->databases();
$services = $this->server->services()->get();
$previews = $this->server->previews();
$foundApplications = [];
$foundApplicationPreviews = [];
$foundDatabases = [];
$foundServices = [];
foreach ($containers as $container) {
$labels = Arr::undot(data_get($container, 'labels'));
$containerStatus = data_get($container, 'state');
$containerHealth = data_get($container, 'health_status', 'unhealthy');
$containerStatus = "$containerStatus ($containerHealth)";
$applicationId = data_get($labels, 'coolify.applicationId');
if ($applicationId) {
$pullRequestId = data_get($labels, 'coolify.pullRequestId');
if ($pullRequestId) {
if (str($applicationId)->contains('-')) {
$applicationId = str($applicationId)->before('-');
}
$preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
if ($preview) {
$foundApplicationPreviews[] = $preview->id;
$statusFromDb = $preview->status;
if ($statusFromDb !== $containerStatus) {
$preview->update(['status' => $containerStatus]);
}
} else {
//Notify user that this container should not be there.
}
} else {
$application = $this->applications->where('id', $applicationId)->first();
if ($application) {
$foundApplications[] = $application->id;
$statusFromDb = $application->status;
if ($statusFromDb !== $containerStatus) {
$application->update(['status' => $containerStatus]);
}
} else {
//Notify user that this container should not be there.
}
}
} else {
$uuid = data_get($labels, 'com.docker.compose.service');
$type = data_get($labels, 'coolify.type');
if ($uuid) {
if ($type === 'service') {
$database_id = data_get($labels, 'coolify.service.subId');
if ($database_id) {
$service_db = ServiceDatabase::where('id', $database_id)->first();
if ($service_db) {
$uuid = $service_db->service->uuid;
$isPublic = data_get($service_db, 'is_public');
if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) {
// TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else {
return data_get($value, 'name') === "$uuid-proxy";
}
})->first();
if (!$foundTcpProxy) {
StartDatabaseProxy::run($service_db);
// $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
}
}
}
}
} else {
$database = $databases->where('uuid', $uuid)->first();
if ($database) {
$isPublic = data_get($database, 'is_public');
$foundDatabases[] = $database->id;
$statusFromDb = $database->status;
if ($statusFromDb !== $containerStatus) {
$database->update(['status' => $containerStatus]);
}
if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) {
// TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else {
return data_get($value, 'name') === "$uuid-proxy";
}
})->first();
if (!$foundTcpProxy) {
StartDatabaseProxy::run($database);
$this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
}
}
} else {
// Notify user that this container should not be there.
}
}
}
if (data_get($container, 'name') === 'coolify-db') {
$foundDatabases[] = 0;
}
}
$serviceLabelId = data_get($labels, 'coolify.serviceId');
if ($serviceLabelId) {
$subType = data_get($labels, 'coolify.service.subType');
$subId = data_get($labels, 'coolify.service.subId');
$service = $services->where('id', $serviceLabelId)->first();
if (!$service) {
continue;
}
if ($subType === 'application') {
$service = $service->applications()->where('id', $subId)->first();
} else {
$service = $service->databases()->where('id', $subId)->first();
}
if ($service) {
$foundServices[] = "$service->id-$service->name";
$statusFromDb = $service->status;
if ($statusFromDb !== $containerStatus) {
// ray('Updating status: ' . $containerStatus);
$service->update(['status' => $containerStatus]);
}
}
}
}
$exitedServices = collect([]);
foreach ($services as $service) {
$apps = $service->applications()->get();
$dbs = $service->databases()->get();
foreach ($apps as $app) {
if (in_array("$app->id-$app->name", $foundServices)) {
continue;
} else {
$exitedServices->push($app);
}
}
foreach ($dbs as $db) {
if (in_array("$db->id-$db->name", $foundServices)) {
continue;
} else {
$exitedServices->push($db);
}
}
}
$exitedServices = $exitedServices->unique('id');
foreach ($exitedServices as $exitedService) {
if (str($exitedService->status)->startsWith('exited')) {
continue;
}
$name = data_get($exitedService, 'name');
$fqdn = data_get($exitedService, 'fqdn');
$containerName = $name ? "$name, available at $fqdn" : $fqdn;
$projectUuid = data_get($service, 'environment.project.uuid');
$serviceUuid = data_get($service, 'uuid');
$environmentName = data_get($service, 'environment.name');
if ($projectUuid && $serviceUuid && $environmentName) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/service/" . $serviceUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
$exitedService->update(['status' => 'exited']);
}
$notRunningApplications = $this->applications->pluck('id')->diff($foundApplications);
foreach ($notRunningApplications as $applicationId) {
$application = $this->applications->where('id', $applicationId)->first();
if (str($application->status)->startsWith('exited')) {
continue;
}
$application->update(['status' => 'exited']);
$name = data_get($application, 'name');
$fqdn = data_get($application, 'fqdn');
$containerName = $name ? "$name ($fqdn)" : $fqdn;
$projectUuid = data_get($application, 'environment.project.uuid');
$applicationUuid = data_get($application, 'uuid');
$environment = data_get($application, 'environment.name');
if ($projectUuid && $applicationUuid && $environment) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environment . "/application/" . $applicationUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
}
$notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
foreach ($notRunningApplicationPreviews as $previewId) {
$preview = $previews->where('id', $previewId)->first();
if (str($preview->status)->startsWith('exited')) {
continue;
}
$preview->update(['status' => 'exited']);
$name = data_get($preview, 'name');
$fqdn = data_get($preview, 'fqdn');
$containerName = $name ? "$name ($fqdn)" : $fqdn;
$projectUuid = data_get($preview, 'application.environment.project.uuid');
$environmentName = data_get($preview, 'application.environment.name');
$applicationUuid = data_get($preview, 'application.uuid');
if ($projectUuid && $applicationUuid && $environmentName) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/application/" . $applicationUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
}
$notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
foreach ($notRunningDatabases as $database) {
$database = $databases->where('id', $database)->first();
if (str($database->status)->startsWith('exited')) {
continue;
}
$database->update(['status' => 'exited']);
$name = data_get($database, 'name');
$fqdn = data_get($database, 'fqdn');
$containerName = $name;
$projectUuid = data_get($database, 'environment.project.uuid');
$environmentName = data_get($database, 'environment.name');
$databaseUuid = data_get($database, 'uuid');
if ($projectUuid && $databaseUuid && $environmentName) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/database/" . $databaseUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
}
// Check if proxy is running
$this->server->proxyType();
$foundProxyContainer = $containers->filter(function ($value, $key) {
if ($this->server->isSwarm()) {
// TODO: fix this with sentinel
return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
} else {
return data_get($value, 'name') === 'coolify-proxy';
}
})->first();
if (!$foundProxyContainer) {
try {
$shouldStart = CheckProxy::run($this->server);
if ($shouldStart) {
StartProxy::run($this->server, false);
$this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
}
} catch (\Throwable $e) {
ray($e);
}
} else {
$this->server->proxy->status = data_get($foundProxyContainer, 'state');
$this->server->save();
$connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
}
} catch (\Exception $e) {
send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
ray($e->getMessage());
return handleError($e);
}
}
private function old_way()
{
if ($this->server->isSwarm()) {
$containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
$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)) {
return;
}
$containers = format_docker_command_output_to_json($containers);
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;
});
}
}
$databases = $this->server->databases();
$services = $this->server->services()->get();
$previews = $this->server->previews();
$foundApplications = [];
$foundApplicationPreviews = [];
$foundDatabases = [];
$foundServices = [];
foreach ($containers as $container) {
if ($this->server->isSwarm()) {
$labels = data_get($container, 'Spec.Labels');
$uuid = data_get($labels, 'coolify.name');
} else {
$labels = data_get($container, 'Config.Labels');
}
$containerStatus = data_get($container, 'State.Status');
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
$containerStatus = "$containerStatus ($containerHealth)";
$labels = Arr::undot(format_docker_labels_to_json($labels));
$applicationId = data_get($labels, 'coolify.applicationId');
if ($applicationId) {
$pullRequestId = data_get($labels, 'coolify.pullRequestId');
if ($pullRequestId) {
if (str($applicationId)->contains('-')) {
$applicationId = str($applicationId)->before('-');
}
$preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
if ($preview) {
$foundApplicationPreviews[] = $preview->id;
$statusFromDb = $preview->status;
if ($statusFromDb !== $containerStatus) {
$preview->update(['status' => $containerStatus]);
}
} else {
//Notify user that this container should not be there.
}
} else {
$application = $this->applications->where('id', $applicationId)->first();
if ($application) {
$foundApplications[] = $application->id;
$statusFromDb = $application->status;
if ($statusFromDb !== $containerStatus) {
$application->update(['status' => $containerStatus]);
}
} else {
//Notify user that this container should not be there.
}
}
} else {
$uuid = data_get($labels, 'com.docker.compose.service');
$type = data_get($labels, 'coolify.type');
if ($uuid) {
if ($type === 'service') {
$database_id = data_get($labels, 'coolify.service.subId');
if ($database_id) {
$service_db = ServiceDatabase::where('id', $database_id)->first();
if ($service_db) {
$uuid = $service_db->service->uuid;
$isPublic = data_get($service_db, 'is_public');
if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) {
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else {
return data_get($value, 'Name') === "/$uuid-proxy";
}
})->first();
if (!$foundTcpProxy) {
StartDatabaseProxy::run($service_db);
// $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
}
}
}
}
} else {
$database = $databases->where('uuid', $uuid)->first();
if ($database) {
$isPublic = data_get($database, 'is_public');
$foundDatabases[] = $database->id;
$statusFromDb = $database->status;
if ($statusFromDb !== $containerStatus) {
$database->update(['status' => $containerStatus]);
}
if ($isPublic) {
$foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
if ($this->server->isSwarm()) {
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
} else {
return data_get($value, 'Name') === "/$uuid-proxy";
}
})->first();
if (!$foundTcpProxy) {
StartDatabaseProxy::run($database);
$this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
}
}
} else {
// Notify user that this container should not be there.
}
}
}
if (data_get($container, 'Name') === '/coolify-db') {
$foundDatabases[] = 0;
}
}
$serviceLabelId = data_get($labels, 'coolify.serviceId');
if ($serviceLabelId) {
$subType = data_get($labels, 'coolify.service.subType');
$subId = data_get($labels, 'coolify.service.subId');
$service = $services->where('id', $serviceLabelId)->first();
if (!$service) {
continue;
}
if ($subType === 'application') {
$service = $service->applications()->where('id', $subId)->first();
} else {
$service = $service->databases()->where('id', $subId)->first();
}
if ($service) {
$foundServices[] = "$service->id-$service->name";
$statusFromDb = $service->status;
if ($statusFromDb !== $containerStatus) {
// ray('Updating status: ' . $containerStatus);
$service->update(['status' => $containerStatus]);
}
}
}
}
$exitedServices = collect([]);
foreach ($services as $service) {
$apps = $service->applications()->get();
$dbs = $service->databases()->get();
foreach ($apps as $app) {
if (in_array("$app->id-$app->name", $foundServices)) {
continue;
} else {
$exitedServices->push($app);
}
}
foreach ($dbs as $db) {
if (in_array("$db->id-$db->name", $foundServices)) {
continue;
} else {
$exitedServices->push($db);
}
}
}
$exitedServices = $exitedServices->unique('id');
foreach ($exitedServices as $exitedService) {
if (str($exitedService->status)->startsWith('exited')) {
continue;
}
$name = data_get($exitedService, 'name');
$fqdn = data_get($exitedService, 'fqdn');
$containerName = $name ? "$name, available at $fqdn" : $fqdn;
$projectUuid = data_get($service, 'environment.project.uuid');
$serviceUuid = data_get($service, 'uuid');
$environmentName = data_get($service, 'environment.name');
if ($projectUuid && $serviceUuid && $environmentName) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/service/" . $serviceUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
$exitedService->update(['status' => 'exited']);
}
$notRunningApplications = $this->applications->pluck('id')->diff($foundApplications);
foreach ($notRunningApplications as $applicationId) {
$application = $this->applications->where('id', $applicationId)->first();
if (str($application->status)->startsWith('exited')) {
continue;
}
$application->update(['status' => 'exited']);
$name = data_get($application, 'name');
$fqdn = data_get($application, 'fqdn');
$containerName = $name ? "$name ($fqdn)" : $fqdn;
$projectUuid = data_get($application, 'environment.project.uuid');
$applicationUuid = data_get($application, 'uuid');
$environment = data_get($application, 'environment.name');
if ($projectUuid && $applicationUuid && $environment) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environment . "/application/" . $applicationUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
}
$notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
foreach ($notRunningApplicationPreviews as $previewId) {
$preview = $previews->where('id', $previewId)->first();
if (str($preview->status)->startsWith('exited')) {
continue;
}
$preview->update(['status' => 'exited']);
$name = data_get($preview, 'name');
$fqdn = data_get($preview, 'fqdn');
$containerName = $name ? "$name ($fqdn)" : $fqdn;
$projectUuid = data_get($preview, 'application.environment.project.uuid');
$environmentName = data_get($preview, 'application.environment.name');
$applicationUuid = data_get($preview, 'application.uuid');
if ($projectUuid && $applicationUuid && $environmentName) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/application/" . $applicationUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
}
$notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
foreach ($notRunningDatabases as $database) {
$database = $databases->where('id', $database)->first();
if (str($database->status)->startsWith('exited')) {
continue;
}
$database->update(['status' => 'exited']);
$name = data_get($database, 'name');
$fqdn = data_get($database, 'fqdn');
$containerName = $name;
$projectUuid = data_get($database, 'environment.project.uuid');
$environmentName = data_get($database, 'environment.name');
$databaseUuid = data_get($database, 'uuid');
if ($projectUuid && $databaseUuid && $environmentName) {
$url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/database/" . $databaseUuid;
} else {
$url = null;
}
$this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
}
// Check if proxy is running
$this->server->proxyType();
$foundProxyContainer = $containers->filter(function ($value, $key) {
if ($this->server->isSwarm()) {
return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
} else {
return data_get($value, 'Name') === '/coolify-proxy';
}
})->first();
if (!$foundProxyContainer) {
try {
$shouldStart = CheckProxy::run($this->server);
if ($shouldStart) {
StartProxy::run($this->server, false);
$this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
}
} catch (\Throwable $e) {
ray($e);
}
} else {
$this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
$this->server->save();
$connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
}
}
}

22
app/Actions/Server/StartSentinel.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
namespace App\Actions\Server;
use Lorisleiva\Actions\Concerns\AsAction;
use App\Models\Server;
class StartSentinel
{
use AsAction;
public function handle(Server $server, $version = 'latest', bool $restart = false)
{
if ($restart) {
instant_remote_process(['docker rm -f coolify-sentinel'], $server, false);
}
instant_remote_process([
"docker run --rm --pull always -d -e \"SCHEDULER=true\" --name coolify-sentinel -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify/metrics:/app/metrics -v /data/coolify/logs:/app/logs --pid host --health-cmd \"curl --fail http://127.0.0.1:8888/api/health || exit 1\" --health-interval 10s --health-retries 3 ghcr.io/coollabsio/sentinel:$version",
"chown -R 9999:root /data/coolify/metrics /data/coolify/logs",
"chmod -R 700 /data/coolify/metrics /data/coolify/logs"
], $server, false);
}
}

6
app/Console/Kernel.php
View File

@@ -9,6 +9,7 @@ use App\Jobs\ScheduledTaskJob;
use App\Jobs\InstanceAutoUpdateJob; use App\Jobs\InstanceAutoUpdateJob;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
use App\Jobs\PullHelperImageJob; use App\Jobs\PullHelperImageJob;
use App\Jobs\PullSentinelImageJob;
use App\Jobs\ServerStatusJob; use App\Jobs\ServerStatusJob;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackup;
@@ -57,7 +58,10 @@ class Kernel extends ConsoleKernel
{ {
$servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4'); $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
foreach ($servers as $server) { foreach ($servers as $server) {
$schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer(); if (config('coolify.is_sentinel_enabled')) {
$schedule->job(new PullSentinelImageJob($server))->everyFiveMinutes()->onOneServer();
}
$schedule->job(new PullHelperImageJob($server))->everyFiveMinutes()->onOneServer();
} }
} }
private function check_resources($schedule) private function check_resources($schedule)

9
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -2,6 +2,7 @@
namespace App\Jobs; namespace App\Jobs;
use App\Actions\Docker\GetContainersStatus;
use App\Enums\ApplicationDeploymentStatus; use App\Enums\ApplicationDeploymentStatus;
use App\Enums\ProcessStatus; use App\Enums\ProcessStatus;
use App\Events\ApplicationStatusChanged; use App\Events\ApplicationStatusChanged;
@@ -302,7 +303,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
{ {
if ($this->server->isProxyShouldRun()) { if ($this->server->isProxyShouldRun()) {
dispatch(new ContainerStatusJob($this->server)); GetContainersStatus::dispatch($this->server);
// dispatch(new ContainerStatusJob($this->server));
} }
$this->next(ApplicationDeploymentStatus::FINISHED->value); $this->next(ApplicationDeploymentStatus::FINISHED->value);
if ($this->pull_request_id !== 0) { if ($this->pull_request_id !== 0) {
@@ -1020,7 +1022,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
"command" => "docker rm -f {$this->deployment_uuid}", "command" => "docker rm -f {$this->deployment_uuid}",
"ignore_errors" => true, "ignore_errors" => true,
"hidden" => true "hidden" => true
], ]
);
$this->execute_remote_command(
[ [
$runCommand, $runCommand,
"hidden" => true, "hidden" => true,
@@ -1287,7 +1291,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
$this->application->parseHealthcheckFromDockerfile($dockerfile); $this->application->parseHealthcheckFromDockerfile($dockerfile);
} }
$docker_compose = [ $docker_compose = [
'version' => '3.8',
'services' => [ 'services' => [
$this->container_name => [ $this->container_name => [
'image' => $this->production_image_name, 'image' => $this->production_image_name,

630
app/Jobs/ContainerStatusJob.php
View File

@@ -2,15 +2,8 @@
namespace App\Jobs; namespace App\Jobs;
use App\Actions\Database\StartDatabaseProxy; use App\Actions\Docker\GetContainersStatus;
use App\Actions\Proxy\CheckProxy;
use App\Actions\Proxy\StartProxy;
use App\Actions\Shared\ComplexStatusCheck;
use App\Models\ApplicationPreview;
use App\Models\Server; use App\Models\Server;
use App\Models\ServiceDatabase;
use App\Notifications\Container\ContainerRestarted;
use App\Notifications\Container\ContainerStopped;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
@@ -18,7 +11,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Arr;
class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
{ {
@@ -44,335 +36,337 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
public function handle() public function handle()
{ {
if (!$this->server->isFunctional()) { GetContainersStatus::run($this->server);
return 'Server is not ready.';
};
$applications = $this->server->applications();
$skip_these_applications = collect([]);
foreach ($applications as $application) {
if ($application->additional_servers->count() > 0) {
$skip_these_applications->push($application);
ComplexStatusCheck::run($application);
$applications = $applications->filter(function ($value, $key) use ($application) {
return $value->id !== $application->id;
});
}
}
$applications = $applications->filter(function ($value, $key) use ($skip_these_applications) {
return !$skip_these_applications->pluck('id')->contains($value->id);
});
try {
if ($this->server->isSwarm()) {
$containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
$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; return;
} // if (!$this->server->isFunctional()) {
$containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server, false); // return 'Server is not ready.';
$containerReplicates = null; // };
} // $applications = $this->server->applications();
if (is_null($containers)) { // $skip_these_applications = collect([]);
return; // foreach ($applications as $application) {
} // if ($application->additional_servers->count() > 0) {
// $skip_these_applications->push($application);
// ComplexStatusCheck::run($application);
// $applications = $applications->filter(function ($value, $key) use ($application) {
// return $value->id !== $application->id;
// });
// }
// }
// $applications = $applications->filter(function ($value, $key) use ($skip_these_applications) {
// return !$skip_these_applications->pluck('id')->contains($value->id);
// });
// try {
// if ($this->server->isSwarm()) {
// $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
// $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)) {
// return;
// }
$containers = format_docker_command_output_to_json($containers); // $containers = format_docker_command_output_to_json($containers);
if ($containerReplicates) { // if ($containerReplicates) {
$containerReplicates = format_docker_command_output_to_json($containerReplicates); // $containerReplicates = format_docker_command_output_to_json($containerReplicates);
foreach ($containerReplicates as $containerReplica) { // foreach ($containerReplicates as $containerReplica) {
$name = data_get($containerReplica, 'Name'); // $name = data_get($containerReplica, 'Name');
$containers = $containers->map(function ($container) use ($name, $containerReplica) { // $containers = $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];
$total = str($replicas)->explode('/')[1]; // $total = str($replicas)->explode('/')[1];
if ($running === $total) { // if ($running === $total) {
data_set($container, 'State.Status', 'running'); // data_set($container, 'State.Status', 'running');
data_set($container, 'State.Health.Status', 'healthy'); // data_set($container, 'State.Health.Status', 'healthy');
} else { // } else {
data_set($container, 'State.Status', 'starting'); // data_set($container, 'State.Status', 'starting');
data_set($container, 'State.Health.Status', 'unhealthy'); // data_set($container, 'State.Health.Status', 'unhealthy');
} // }
} // }
return $container; // return $container;
}); // });
} // }
} // }
$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 ($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');
} else { // } else {
$labels = data_get($container, 'Config.Labels'); // $labels = data_get($container, 'Config.Labels');
} // }
$containerStatus = data_get($container, 'State.Status'); // $containerStatus = data_get($container, 'State.Status');
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy'); // $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
$containerStatus = "$containerStatus ($containerHealth)"; // $containerStatus = "$containerStatus ($containerHealth)";
$labels = Arr::undot(format_docker_labels_to_json($labels)); // $labels = Arr::undot(format_docker_labels_to_json($labels));
$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 = $applications->where('id', $applicationId)->first(); // $application = $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 = $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 {
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 = $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 {
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');
$containerName = $name ? "$name, available at $fqdn" : $fqdn; // $containerName = $name ? "$name, available at $fqdn" : $fqdn;
$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 = $applications->pluck('id')->diff($foundApplications); // $notRunningApplications = $applications->pluck('id')->diff($foundApplications);
foreach ($notRunningApplications as $applicationId) { // foreach ($notRunningApplications as $applicationId) {
$application = $applications->where('id', $applicationId)->first(); // $application = $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 = $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 {
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.Status'); // $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
$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 (\Throwable $e) { // } catch (\Throwable $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);
} // }
} }
} }

56
app/Jobs/PullSentinelImageJob.php Normal file
View File

@@ -0,0 +1,56 @@
<?php
namespace App\Jobs;
use App\Actions\Server\StartSentinel;
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\Middleware\WithoutOverlapping;
use Illuminate\Queue\SerializesModels;
class PullSentinelImageJob implements ShouldQueue, ShouldBeEncrypted
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $timeout = 1000;
public function middleware(): array
{
return [(new WithoutOverlapping($this->server->uuid))];
}
public function uniqueId(): string
{
return $this->server->uuid;
}
public function __construct(public Server $server)
{
}
public function handle(): void
{
try {
$version = get_latest_sentinel_version();
if (!$version) {
ray('Failed to get latest Sentinel version');
return;
}
$local_version = instant_remote_process(['docker exec coolify-sentinel sh -c "curl http://127.0.0.1:8888/api/version"'], $this->server, false);
if (empty($local_version)) {
$local_version = '0.0.0';
}
if (version_compare($local_version, $version, '<')) {
StartSentinel::run($this->server, $version, true);
return;
}
ray('Sentinel image is up to date');
} catch (\Throwable $e) {
send_internal_notification('PullSentinelImageJob failed with: ' . $e->getMessage());
ray($e->getMessage());
throw $e;
}
}
}

3
app/Jobs/ServerStatusJob.php
View File

@@ -44,6 +44,9 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
if ($this->server->isFunctional()) { if ($this->server->isFunctional()) {
$this->cleanup(notify: false); $this->cleanup(notify: false);
$this->removeCoolifyYaml(); $this->removeCoolifyYaml();
if (config('coolify.is_sentinel_enabled')) {
$this->server->checkSentinel();
}
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage()); send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());

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

@@ -3,6 +3,7 @@
namespace App\Livewire\Project\Application; namespace App\Livewire\Project\Application;
use App\Actions\Application\StopApplication; use App\Actions\Application\StopApplication;
use App\Actions\Docker\GetContainersStatus;
use App\Events\ApplicationStatusChanged; use App\Events\ApplicationStatusChanged;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
use App\Jobs\ServerStatusJob; use App\Jobs\ServerStatusJob;
@@ -32,7 +33,8 @@ class Heading extends Component
public function check_status($showNotification = false) public function check_status($showNotification = false)
{ {
if ($this->application->destination->server->isFunctional()) { if ($this->application->destination->server->isFunctional()) {
dispatch(new ContainerStatusJob($this->application->destination->server)); GetContainersStatus::dispatch($this->application->destination->server);
// dispatch(new ContainerStatusJob($this->application->destination->server));
} else { } else {
dispatch(new ServerStatusJob($this->application->destination->server)); dispatch(new ServerStatusJob($this->application->destination->server));
} }

4
app/Livewire/Project/Database/Heading.php
View File

@@ -11,6 +11,7 @@ use App\Actions\Database\StartMysql;
use App\Actions\Database\StartPostgresql; use App\Actions\Database\StartPostgresql;
use App\Actions\Database\StartRedis; use App\Actions\Database\StartRedis;
use App\Actions\Database\StopDatabase; use App\Actions\Database\StopDatabase;
use App\Actions\Docker\GetContainersStatus;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
use Livewire\Component; use Livewire\Component;
@@ -44,7 +45,8 @@ class Heading extends Component
public function check_status($showNotification = false) public function check_status($showNotification = false)
{ {
dispatch_sync(new ContainerStatusJob($this->database->destination->server)); GetContainersStatus::run($this->database->destination->server);
// dispatch_sync(new ContainerStatusJob($this->database->destination->server));
$this->database->refresh(); $this->database->refresh();
if ($showNotification) $this->dispatch('success', 'Database status updated.'); if ($showNotification) $this->dispatch('success', 'Database status updated.');
} }

5
app/Livewire/Project/New/GithubPrivateRepository.php
View File

@@ -150,7 +150,7 @@ class GithubPrivateRepository extends Component
'repository_project_id' => $this->selected_repository_id, 'repository_project_id' => $this->selected_repository_id,
'git_repository' => "{$this->selected_repository_owner}/{$this->selected_repository_repo}", 'git_repository' => "{$this->selected_repository_owner}/{$this->selected_repository_repo}",
'git_branch' => $this->selected_branch_name, 'git_branch' => $this->selected_branch_name,
'build_pack' => 'nixpacks', 'build_pack' => $this->build_pack,
'ports_exposes' => $this->port, 'ports_exposes' => $this->port,
'publish_directory' => $this->publish_directory, 'publish_directory' => $this->publish_directory,
'environment_id' => $environment->id, 'environment_id' => $environment->id,
@@ -162,6 +162,9 @@ class GithubPrivateRepository extends Component
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;
$application->settings->save(); $application->settings->save();
if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
$application->health_check_enabled = false;
}
$fqdn = generateFqdn($destination->server, $application->uuid); $fqdn = generateFqdn($destination->server, $application->uuid);
$application->fqdn = $fqdn; $application->fqdn = $fqdn;

10
app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
View File

@@ -19,7 +19,7 @@ class GithubPrivateRepositoryDeployKey extends Component
public $current_step = 'private_keys'; public $current_step = 'private_keys';
public $parameters; public $parameters;
public $query; public $query;
public $private_keys =[]; public $private_keys = [];
public int $private_key_id; public int $private_key_id;
public int $port = 3000; public int $port = 3000;
@@ -125,7 +125,7 @@ class GithubPrivateRepositoryDeployKey extends Component
'name' => generate_random_name(), 'name' => generate_random_name(),
'git_repository' => $this->git_repository, 'git_repository' => $this->git_repository,
'git_branch' => $this->branch, 'git_branch' => $this->branch,
'build_pack' => 'nixpacks', 'build_pack' => $this->build_pack,
'ports_exposes' => $this->port, 'ports_exposes' => $this->port,
'publish_directory' => $this->publish_directory, 'publish_directory' => $this->publish_directory,
'environment_id' => $environment->id, 'environment_id' => $environment->id,
@@ -138,7 +138,7 @@ class GithubPrivateRepositoryDeployKey extends Component
'name' => generate_random_name(), 'name' => generate_random_name(),
'git_repository' => $this->git_repository, 'git_repository' => $this->git_repository,
'git_branch' => $this->branch, 'git_branch' => $this->branch,
'build_pack' => 'nixpacks', 'build_pack' => $this->build_pack,
'ports_exposes' => $this->port, 'ports_exposes' => $this->port,
'publish_directory' => $this->publish_directory, 'publish_directory' => $this->publish_directory,
'environment_id' => $environment->id, 'environment_id' => $environment->id,
@@ -149,7 +149,9 @@ class GithubPrivateRepositoryDeployKey extends Component
'source_type' => $this->git_source->getMorphClass() 'source_type' => $this->git_source->getMorphClass()
]; ];
} }
if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
$application_init['health_check_enabled'] = false;
}
$application = Application::create($application_init); $application = Application::create($application_init);
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;
$application->settings->save(); $application->settings->save();

3
app/Livewire/Project/New/PublicGitRepository.php
View File

@@ -205,6 +205,9 @@ class PublicGitRepository extends Component
]; ];
} }
if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
$application_init['health_check_enabled'] = false;
}
$application = Application::create($application_init); $application = Application::create($application_init);
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;

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

@@ -2,6 +2,7 @@
namespace App\Livewire\Project\Service; namespace App\Livewire\Project\Service;
use App\Actions\Docker\GetContainersStatus;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
use App\Models\Service; use App\Models\Service;
use Livewire\Component; use Livewire\Component;
@@ -64,7 +65,8 @@ class Configuration extends Component
public function check_status() public function check_status()
{ {
try { try {
dispatch_sync(new ContainerStatusJob($this->service->server)); GetContainersStatus::run($this->service->server);
// dispatch_sync(new ContainerStatusJob($this->service->server));
$this->dispatch('refresh')->self(); $this->dispatch('refresh')->self();
$this->dispatch('updateStatus'); $this->dispatch('updateStatus');
} catch (\Exception $e) { } catch (\Exception $e) {

4
app/Livewire/Project/Shared/Destination.php
View File

@@ -3,6 +3,7 @@
namespace App\Livewire\Project\Shared; namespace App\Livewire\Project\Shared;
use App\Actions\Application\StopApplicationOneServer; use App\Actions\Application\StopApplicationOneServer;
use App\Actions\Docker\GetContainersStatus;
use App\Events\ApplicationStatusChanged; use App\Events\ApplicationStatusChanged;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
use App\Models\Server; use App\Models\Server;
@@ -90,7 +91,8 @@ class Destination extends Component
} }
public function refreshServers() public function refreshServers()
{ {
ContainerStatusJob::dispatchSync($this->resource->destination->server); GetContainersStatus::run($this->resource->destination->server);
// ContainerStatusJob::dispatchSync($this->resource->destination->server);
$this->loadData(); $this->loadData();
$this->dispatch('refresh'); $this->dispatch('refresh');
ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id')); ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));

2
app/Livewire/Project/Shared/ExecuteContainerCommand.php
View File

@@ -122,7 +122,7 @@ class ExecuteContainerCommand extends Component
if ($server->isForceDisabled()) { if ($server->isForceDisabled()) {
throw new \RuntimeException('Server is disabled.'); throw new \RuntimeException('Server is disabled.');
} }
$cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command) . '"'; $cmd = "sh -c 'if [ -f ~/.profile ]; then . ~/.profile; fi; " . str_replace("'", "'\''", $this->command) . "'";
if (!empty($this->workDir)) { if (!empty($this->workDir)) {
$exec = "docker exec -w {$this->workDir} {$container_name} {$cmd}"; $exec = "docker exec -w {$this->workDir} {$container_name} {$cmd}";
} else { } else {

11
app/Livewire/Project/Shared/Logs.php
View File

@@ -27,7 +27,7 @@ class Logs extends Component
public $query; public $query;
public $status; public $status;
public $serviceSubType; public $serviceSubType;
public $cpu;
public function loadContainers($server_id) public function loadContainers($server_id)
{ {
try { try {
@@ -49,6 +49,14 @@ class Logs extends Component
return handleError($e, $this); return handleError($e, $this);
} }
} }
public function loadMetrics()
{
return;
$server = data_get($this->resource, 'destination.server');
if ($server->isFunctional()) {
$this->cpu = $server->getMetrics();
}
}
public function mount() public function mount()
{ {
try { try {
@@ -95,6 +103,7 @@ class Logs extends Component
} }
} }
$this->containers = $this->containers->sort(); $this->containers = $this->containers->sort();
$this->loadMetrics();
} catch (\Exception $e) { } catch (\Exception $e) {
return handleError($e, $this); return handleError($e, $this);
} }

4
app/Livewire/Server/Proxy/Status.php
View File

@@ -2,6 +2,7 @@
namespace App\Livewire\Server\Proxy; namespace App\Livewire\Server\Proxy;
use App\Actions\Docker\GetContainersStatus;
use App\Actions\Proxy\CheckProxy; use App\Actions\Proxy\CheckProxy;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
use App\Models\Server; use App\Models\Server;
@@ -49,7 +50,8 @@ class Status extends Component
public function getProxyStatus() public function getProxyStatus()
{ {
try { try {
dispatch_sync(new ContainerStatusJob($this->server)); GetContainersStatus::run($this->server);
// dispatch_sync(new ContainerStatusJob($this->server));
$this->dispatch('proxyStatusUpdated'); $this->dispatch('proxyStatusUpdated');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);

1
app/Livewire/Tags/Deployments.php
View File

@@ -26,6 +26,7 @@ class Deployments extends Component
"server_id", "server_id",
"status" "status"
])->sortBy('id')->groupBy('server_name')->toArray(); ])->sortBy('id')->groupBy('server_name')->toArray();
$this->dispatch('deployments', $this->deployments_per_tag_per_server);
} catch (\Exception $e) { } catch (\Exception $e) {
return handleError($e, $this); return handleError($e, $this);
} }

15
app/Livewire/Tags/Index.php
View File

@@ -20,6 +20,12 @@ class Index extends Component
public $webhook = null; public $webhook = null;
public $deployments_per_tag_per_server = []; public $deployments_per_tag_per_server = [];
protected $listeners = ['deployments' => 'update_deployments'];
public function update_deployments($deployments)
{
$this->deployments_per_tag_per_server = $deployments;
}
public function tag_updated() public function tag_updated()
{ {
if ($this->tag == "") { if ($this->tag == "") {
@@ -39,14 +45,13 @@ class Index extends Component
public function redeploy_all() public function redeploy_all()
{ {
try { try {
$message = collect([]); $this->applications->each(function ($resource){
$this->applications->each(function ($resource) use ($message) {
$deploy = new Deploy(); $deploy = new Deploy();
$message->push($deploy->deploy_resource($resource)); $deploy->deploy_resource($resource);
}); });
$this->services->each(function ($resource) use ($message) { $this->services->each(function ($resource) {
$deploy = new Deploy(); $deploy = new Deploy();
$message->push($deploy->deploy_resource($resource)); $deploy->deploy_resource($resource);
}); });
$this->dispatch('success', 'Mass deployment started.'); $this->dispatch('success', 'Mass deployment started.');
} catch (\Exception $e) { } catch (\Exception $e) {

64
app/Models/Server.php
View File

@@ -3,11 +3,14 @@
namespace App\Models; namespace App\Models;
use App\Actions\Server\InstallDocker; use App\Actions\Server\InstallDocker;
use App\Actions\Server\StartSentinel;
use App\Enums\ProxyTypes; use App\Enums\ProxyTypes;
use App\Jobs\PullSentinelImageJob;
use App\Notifications\Server\Revived; use App\Notifications\Server\Revived;
use App\Notifications\Server\Unreachable; use App\Notifications\Server\Unreachable;
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\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Spatie\SchemalessAttributes\Casts\SchemalessAttributes; use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
@@ -462,6 +465,36 @@ $schema://$host {
Storage::disk('ssh-keys')->delete($sshKeyFileLocation); Storage::disk('ssh-keys')->delete($sshKeyFileLocation);
Storage::disk('ssh-mux')->delete($this->muxFilename()); Storage::disk('ssh-mux')->delete($this->muxFilename());
} }
public function checkSentinel()
{
ray("Checking sentinel on server: {$this->name}");
if ($this->is_metrics_enabled) {
$sentinel_found = instant_remote_process(["docker inspect coolify-sentinel"], $this, false);
$sentinel_found = json_decode($sentinel_found, true);
$status = data_get($sentinel_found, '0.State.Status', 'exited');
if ($status !== 'running') {
ray('Sentinel is not running, starting it...');
PullSentinelImageJob::dispatch($this);
} else {
ray('Sentinel is running');
}
}
}
public function getMetrics()
{
if ($this->is_metrics_enabled) {
$from = now()->subMinutes(5)->toIso8601ZuluString();
$cpu = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl http://localhost:8888/api/cpu/history?from=$from'"], $this, false);
$cpu = str($cpu)->explode("\n")->skip(1)->all();
$parsedCollection = collect($cpu)->flatMap(function ($item) {
return collect(explode("\n", trim($item)))->map(function ($line) {
list($time, $value) = explode(',', trim($line));
return [(int) $time, (float) $value];
});
})->toArray();
return $parsedCollection;
}
}
public function isServerReady(int $tries = 3) public function isServerReady(int $tries = 3)
{ {
if ($this->skipServer()) { if ($this->skipServer()) {
@@ -548,7 +581,36 @@ $schema://$host {
{ {
return instant_remote_process(["docker start $id"], $this); return instant_remote_process(["docker start $id"], $this);
} }
public function loadUnmanagedContainers() public function getContainers(): Collection
{
$sentinel_found = instant_remote_process(["docker inspect coolify-sentinel"], $this, false);
$sentinel_found = json_decode($sentinel_found, true);
$status = data_get($sentinel_found, '0.State.Status', 'exited');
if ($status === 'running') {
$containers = instant_remote_process(['docker exec coolify-sentinel sh -c "curl http://127.0.0.1:8888/api/containers"'], $this, false);
if (is_null($containers)) {
return collect([]);
}
$containers = data_get(json_decode($containers, true), '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);
}
}
public function loadUnmanagedContainers(): Collection
{ {
if ($this->isFunctional()) { if ($this->isFunctional()) {
$containers = instant_remote_process(["docker ps -a --format '{{json .}}'"], $this); $containers = instant_remote_process(["docker ps -a --format '{{json .}}'"], $this);

40
app/Models/Service.php
View File

@@ -171,7 +171,7 @@ class Service extends BaseModel
], ],
]); ]);
} }
$fields->put('Tolgee', $data); $fields->put('Tolgee', $data->toArray());
break; break;
case str($image)?->contains('logto'): case str($image)?->contains('logto'):
$data = collect([]); $data = collect([]);
@@ -195,7 +195,7 @@ class Service extends BaseModel
], ],
]); ]);
} }
$fields->put('Logto', $data); $fields->put('Logto', $data->toArray());
break; break;
case str($image)?->contains('unleash-server'): case str($image)?->contains('unleash-server'):
$data = collect([]); $data = collect([]);
@@ -218,7 +218,7 @@ class Service extends BaseModel
], ],
]); ]);
} }
$fields->put('Unleash', $data); $fields->put('Unleash', $data->toArray());
break; break;
case str($image)?->contains('grafana'): case str($image)?->contains('grafana'):
$data = collect([]); $data = collect([]);
@@ -241,7 +241,7 @@ class Service extends BaseModel
], ],
]); ]);
} }
$fields->put('Grafana', $data); $fields->put('Grafana', $data->toArray());
break; break;
case str($image)?->contains('directus'): case str($image)?->contains('directus'):
$data = collect([]); $data = collect([]);
@@ -267,7 +267,7 @@ class Service extends BaseModel
], ],
]); ]);
} }
$fields->put('Directus', $data); $fields->put('Directus', $data->toArray());
break; break;
case str($image)?->contains('kong'): case str($image)?->contains('kong'):
$data = collect([]); $data = collect([]);
@@ -370,7 +370,7 @@ class Service extends BaseModel
], ],
]); ]);
} }
$fields->put('Weblate', $data); $fields->put('Weblate', $data->toArray());
break; break;
case str($image)?->contains('meilisearch'): case str($image)?->contains('meilisearch'):
$data = collect([]); $data = collect([]);
@@ -384,7 +384,7 @@ class Service extends BaseModel
], ],
]); ]);
} }
$fields->put('Meilisearch', $data); $fields->put('Meilisearch', $data->toArray());
break; break;
case str($image)?->contains('ghost'): case str($image)?->contains('ghost'):
$data = collect([]); $data = collect([]);
@@ -444,7 +444,31 @@ class Service extends BaseModel
]); ]);
} }
$fields->put('Ghost', $data); $fields->put('Ghost', $data->toArray());
break;
default:
$data = collect([]);
$admin_user = $this->environment_variables()->where('key', 'SERVICE_USER_ADMIN')->first();
$admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_ADMIN')->first();
$data = $data->merge([
'User' => [
'key' => 'SERVICE_USER_ADMIN',
'value' => data_get($admin_user, 'value', 'admin'),
'readonly' => true,
'rules' => 'required',
],
]);
if ($admin_password) {
$data = $data->merge([
'Password' => [
'key' => 'SERVICE_PASSWORD_ADMIN',
'value' => data_get($admin_password, 'value'),
'rules' => 'required',
'isPassword' => true,
],
]);
}
$fields->put('Admin', $data->toArray());
break; break;
} }
} }

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

@@ -2,6 +2,7 @@
namespace App\Notifications\Server; namespace App\Notifications\Server;
use App\Actions\Docker\GetContainersStatus;
use App\Jobs\ContainerStatusJob; use App\Jobs\ContainerStatusJob;
use App\Models\Server; use App\Models\Server;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
@@ -22,7 +23,8 @@ class Revived extends Notification implements ShouldQueue
if ($this->server->unreachable_notification_sent === false) { if ($this->server->unreachable_notification_sent === false) {
return; return;
} }
dispatch(new ContainerStatusJob($server)); GetContainersStatus::dispatch($server);
// dispatch(new ContainerStatusJob($server));
} }
public function via(object $notifiable): array public function via(object $notifiable): array

16
bootstrap/helpers/shared.php
View File

@@ -147,6 +147,18 @@ function get_route_parameters(): array
return Route::current()->parameters(); return Route::current()->parameters();
} }
function get_latest_sentinel_version(): string
{
try {
$response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
$versions = $response->json();
return data_get($versions, 'coolify.sentinel.version');
} catch (\Throwable $e) {
//throw $e;
ray($e->getMessage());
return '0.0.0';
}
}
function get_latest_version_of_coolify(): string function get_latest_version_of_coolify(): string
{ {
try { try {
@@ -637,7 +649,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$allServices = getServiceTemplates(); $allServices = getServiceTemplates();
$topLevelVolumes = collect(data_get($yaml, 'volumes', [])); $topLevelVolumes = collect(data_get($yaml, 'volumes', []));
$topLevelNetworks = collect(data_get($yaml, 'networks', [])); $topLevelNetworks = collect(data_get($yaml, 'networks', []));
$dockerComposeVersion = data_get($yaml, 'version') ?? '3.8';
$services = data_get($yaml, 'services'); $services = data_get($yaml, 'services');
$generatedServiceFQDNS = collect([]); $generatedServiceFQDNS = collect([]);
@@ -1192,7 +1203,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
return $service; return $service;
}); });
$finalServices = [ $finalServices = [
'version' => $dockerComposeVersion,
'services' => $services->toArray(), 'services' => $services->toArray(),
'volumes' => $topLevelVolumes->toArray(), 'volumes' => $topLevelVolumes->toArray(),
'networks' => $topLevelNetworks->toArray(), 'networks' => $topLevelNetworks->toArray(),
@@ -1230,7 +1240,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$topLevelVolumes = collect([]); $topLevelVolumes = collect([]);
} }
$topLevelNetworks = collect(data_get($yaml, 'networks', [])); $topLevelNetworks = collect(data_get($yaml, 'networks', []));
$dockerComposeVersion = data_get($yaml, 'version') ?? '3.8';
$services = data_get($yaml, 'services'); $services = data_get($yaml, 'services');
$generatedServiceFQDNS = collect([]); $generatedServiceFQDNS = collect([]);
@@ -1661,7 +1670,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
}); });
} }
$finalServices = [ $finalServices = [
'version' => $dockerComposeVersion,
'services' => $services->toArray(), 'services' => $services->toArray(),
'volumes' => $topLevelVolumes->toArray(), 'volumes' => $topLevelVolumes->toArray(),
'networks' => $topLevelNetworks->toArray(), 'networks' => $topLevelNetworks->toArray(),

1
config/coolify.php
View File

@@ -14,4 +14,5 @@ return [
'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper:latest'), 'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper:latest'),
'is_horizon_enabled' => env('HORIZON_ENABLED', true), 'is_horizon_enabled' => env('HORIZON_ENABLED', true),
'is_scheduler_enabled' => env('SCHEDULER_ENABLED', true), 'is_scheduler_enabled' => env('SCHEDULER_ENABLED', true),
'is_sentinel_enabled' => env('SENTINEL_ENABLED', false),
]; ];

2
config/sentry.php
View File

@@ -7,7 +7,7 @@ return [
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.276', 'release' => '4.0.0-beta.277',
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

2
config/version.php
View File

@@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.276'; return '4.0.0-beta.277';

28
database/migrations/2024_05_07_124019_add_server_metrics.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('servers', function (Blueprint $table) {
$table->boolean('is_metrics_enabled')->default(true);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('servers', function (Blueprint $table) {
$table->dropColumn('is_metrics_enabled');
});
}
};

2
docker-compose.dev.yml
View File

@@ -1,5 +1,3 @@
version: "3.8"
services: services:
coolify: coolify:
build: build:

1
docker-compose.prod.yml
View File

@@ -1,4 +1,3 @@
version: '3.8'
services: services:
coolify: coolify:
image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-latest}" image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-latest}"

1
docker-compose.windows.yml
View File

@@ -1,4 +1,3 @@
version: '3.8'
services: services:
coolify-testing-host: coolify-testing-host:
init: true init: true

2
docker-compose.yml
View File

@@ -1,4 +1,3 @@
version: '3.8'
services: services:
coolify: coolify:
container_name: coolify container_name: coolify
@@ -11,7 +10,6 @@ services:
depends_on: depends_on:
- postgres - postgres
- redis - redis
postgres: postgres:
image: postgres:15-alpine image: postgres:15-alpine
container_name: coolify-db container_name: coolify-db

11
other/scripts/get-subs.php Normal file
View File

@@ -0,0 +1,11 @@
$handle = fopen("/tmp/export.csv", "w");
App\Models\Team::chunk(100, function ($teams) use ($handle) {
foreach ($teams as $team) {
if ($team->subscription->stripe_invoice_paid == true) {
foreach ($team->members as $member) {
fputcsv($handle, [$member->email, $member->name], ",");
}
}
}
});
fclose($handle);

2
public/svgs/listmonk.svg Normal file
View File

@@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="163.03" height="30.38" viewBox="0 0 43.135 8.038" xmlns:v="https://vecta.io/nano"><circle cx="4.019" cy="4.019" r="3.149" fill="#fff" stroke="#0055d4" stroke-width="1.74"/><path d="M11.457 7.303q-.566 0-.879-.322-.313-.331-.313-.932V.712L11.5.572v5.442q0 .305.253.305.139 0 .244-.052l.253.879q-.357.157-.792.157zm2.619-4.754v4.615H12.84V2.549zM13.449.172q.331 0 .54.209.218.2.218.514 0 .313-.218.522-.209.2-.54.2-.331 0-.54-.2-.209-.209-.209-.522 0-.313.209-.514.209-.209.54-.209zm3.319 2.238q.975 0 1.672.557l-.47.705q-.583-.366-1.149-.366-.305 0-.47.113-.165.113-.165.305 0 .139.07.235.078.096.279.183.209.087.618.209.731.2 1.088.54.357.331.357.914 0 .462-.27.801-.261.34-.714.522-.453.174-1.01.174-.583 0-1.062-.174-.479-.183-.819-.496l.61-.679q.583.453 1.237.453.348 0 .549-.131.209-.139.209-.374 0-.183-.078-.287-.078-.104-.287-.192-.209-.096-.653-.218-.697-.192-1.036-.54-.331-.357-.331-.879 0-.392.226-.705.226-.313.636-.488.418-.183.967-.183zm5.342 4.536q-.253.174-.575.261-.313.096-.627.096-.714-.009-1.08-.409-.366-.401-.366-1.176V3.42h-.688v-.871h.688v-1.01l1.237-.148v1.158h1.062l-.122.871h-.94v2.273q0 .331.113.479.113.148.348.148.235 0 .522-.157zm5.493-4.536q.549 0 .879.374.34.374.34 1.019v3.361h-1.237V4.012q0-.679-.453-.679-.244 0-.427.157-.183.157-.374.488v3.187h-1.237V4.012q0-.679-.453-.679-.244 0-.427.165-.183.157-.366.479v3.187h-1.237V2.549h1.071l.096.575q.261-.348.583-.531.331-.183.758-.183.392 0 .679.2.287.192.418.549.287-.374.618-.557.34-.192.766-.192zm4.148 0q1.036 0 1.62.653.583.644.583 1.794 0 .731-.27 1.289-.261.549-.766.853-.496.305-1.176.305-1.036 0-1.628-.644-.583-.653-.583-1.803 0-.731.261-1.28.27-.557.766-.862.505-.305 1.193-.305zm0 .923q-.47 0-.705.374-.226.366-.226 1.149 0 .784.226 1.158.235.366.697.366.462 0 .688-.366.235-.374.235-1.158 0-.784-.226-1.149-.226-.374-.688-.374zm5.271-.923q.61 0 .949.374.34.366.34 1.019v3.361h-1.237V4.012q0-.374-.131-.522-.122-.157-.374-.157-.261 0-.479.165-.209.157-.409.479v3.187h-1.237V2.549h1.071l.096.583q.287-.357.627-.54.348-.183.784-.183zM40.2.572v6.592h-1.237V.712zm2.804 1.977l-1.472 2.029 1.602 2.586h-1.402l-1.489-2.525 1.48-2.09z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

11
resources/views/livewire/dashboard.blade.php
View File

@@ -23,23 +23,24 @@
@if (data_get($project, 'environments')->count() === 1) onclick="gotoProject('{{ data_get($project, 'uuid') }}', '{{ data_get($project, 'environments.0.name', 'production') }}')" @if (data_get($project, 'environments')->count() === 1) onclick="gotoProject('{{ data_get($project, 'uuid') }}', '{{ data_get($project, 'environments.0.name', 'production') }}')"
@else @else
onclick="window.location.href = '{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}'" @endif> onclick="window.location.href = '{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}'" @endif>
<div class="flex flex-col justify-center flex-1 mx-6"> <div class="flex flex-1 mx-6">
<div class="flex flex-col justify-center flex-1">
<div class="box-title">{{ $project->name }}</div> <div class="box-title">{{ $project->name }}</div>
<div class="box-description"> <div class="box-description">
{{ $project->description }}</div> {{ $project->description }}</div>
</div> </div>
<span <div class="flex items-center justify-center gap-2 text-xs font-bold ">
class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
<a class="hover:underline" <a class="hover:underline"
href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}"> href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
<span class="p-2 font-bold">+ <span class="p-2 font-bold">+
Add Resource</span> Add Resource</span>
</a> </a>
<a class="font-bold hover:underline" <a class="hover:underline"
href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}"> href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
Settings Settings
</a> </a>
</span> </div>
</div>
</div> </div>
@endforeach @endforeach
</div> </div>

6
resources/views/livewire/project/new/github-private-repository.blade.php
View File

@@ -33,14 +33,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="flex flex-col items-center justify-center">
<x-loading wire:loading wire:target="loadRepositories({{ $ghapp->id }})" />
</div>
@endforeach @endforeach
</div> </div>
@endif @endif
@if ($current_step === 'repository') @if ($current_step === 'repository')
@if ($repositories->count() > 0) @if ($repositories->count() > 0)
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<x-forms.select class="w-full" label="Repository" <x-forms.select class="w-full" label="Repository" wire:model="selected_repository_id">
wire:model="selected_repository_id">
@foreach ($repositories as $repo) @foreach ($repositories as $repo)
@if ($loop->first) @if ($loop->first)
<option selected value="{{ data_get($repo, 'id') }}"> <option selected value="{{ data_get($repo, 'id') }}">

74
resources/views/livewire/project/shared/logs.blade.php
View File

@@ -54,4 +54,78 @@
@endforelse @endforelse
</div> </div>
@endif @endif
{{-- <section x-data="apex_app" class="container p-5 mx-auto my-20 bg-white drop-shadow-xl rounded-xl">
<div class="w-full" x-ref="chart"></div>
</section>
<script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
<script>
document.addEventListener("alpine:init", () => {
Alpine.data("apex_app", () => ({
data: @js($cpu),
init() {
let chart = new ApexCharts(this.$refs.chart, this.options);
chart.render();
this.$watch("data", () => {
chart.updateOptions(this.options);
});
},
get options() {
return {
colors: [function({
value,
seriesIndex,
w
}) {
if (value < 55) {
return '#7E36AF'
} else {
return '#D9534F'
}
}, function({
value,
seriesIndex,
w
}) {
if (value < 111) {
return '#7E36AF'
} else {
return '#D9534F'
}
}],
xaxis: {
type: 'datetime'
},
dataLabels: {
enabled: false
},
series: [{
name: "Series name",
data: this.data
}],
tooltip: {
enabled: true
},
chart: {
stroke: {
curve: 'smooth',
},
height: 500,
width: "100%",
type: "line",
toolbar: {
show: true
},
animations: {
initialAnimation: {
enabled: false
}
}
},
};
}
}));
});
</script> --}}
</div> </div>

4
resources/views/livewire/project/shared/resource-operations.blade.php
View File

@@ -6,7 +6,7 @@
<div class="pb-4"> <div class="pb-4">
<div class="flex flex-col flex-wrap gap-2"> <div class="flex flex-col flex-wrap gap-2">
@foreach ($servers->sortBy('id') as $server) @foreach ($servers->sortBy('id') as $server)
<h5>Server: <span class="font-bold text-white">{{ $server->name }}</span></h5> <h5>Server: <span class="font-bold text-dark dark:text-white">{{ $server->name }}</span></h5>
@foreach ($server->destinations() as $destination) @foreach ($server->destinations() as $destination)
<x-modal-confirmation action="cloneTo({{ data_get($destination, 'id') }})"> <x-modal-confirmation action="cloneTo({{ data_get($destination, 'id') }})">
<x:slot name="content"> <x:slot name="content">
@@ -33,7 +33,7 @@
</div> </div>
<div class="flex flex-col flex-wrap gap-2"> <div class="flex flex-col flex-wrap gap-2">
@forelse ($projects as $project) @forelse ($projects as $project)
<h5>Project: <span class="font-bold text-white">{{ $project->name }}</span></h5> <h5>Project: <span class="font-bold text-dark dark:text-white">{{ $project->name }}</span></h5>
@foreach ($project->environments as $environment) @foreach ($project->environments as $environment)
<x-modal-confirmation action="moveTo({{ data_get($environment, 'id') }})"> <x-modal-confirmation action="moveTo({{ data_get($environment, 'id') }})">

14
resources/views/livewire/project/show.blade.php
View File

@@ -11,19 +11,27 @@
@forelse ($project->environments as $environment) @forelse ($project->environments as $environment)
<div class="gap-2 border border-transparent cursor-pointer box group" x-data <div class="gap-2 border border-transparent cursor-pointer box group" x-data
x-on:click="goto('{{ $project->uuid }}','{{ $environment->name }}')"> x-on:click="goto('{{ $project->uuid }}','{{ $environment->name }}')">
<a class="flex flex-col justify-center flex-1 mx-6 hover:no-underline" <div class="flex flex-1 mx-6">
<a class="flex flex-col justify-center flex-1"
href="{{ route('project.resource.index', [$project->uuid, $environment->name]) }}"> href="{{ route('project.resource.index', [$project->uuid, $environment->name]) }}">
<div class="font-bold dark:text-white"> {{ $environment->name }}</div> <div class="font-bold dark:text-white"> {{ $environment->name }}</div>
<div class="description"> <div class="description">
{{ $environment->description }}</div> {{ $environment->description }}</div>
</a> </a>
<div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal"> <div class="flex items-center justify-center gap-2 text-xs">
<a class="mx-4 font-bold hover:underline" <a class="font-bold hover:underline"
href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}"> href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}">
Settings Settings
</a> </a>
</div> </div>
</div> </div>
{{-- <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
<a class="mx-4 font-bold hover:underline"
href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}">
Settings
</a>
</div> --}}
</div>
@empty @empty
<p>No environments found.</p> <p>No environments found.</p>
@endforelse @endforelse

4
resources/views/livewire/server/resources.blade.php
View File

@@ -1,7 +1,7 @@
<div> <div>
<x-server.navbar :server="$server" :parameters="$parameters" /> <x-server.navbar :server="$server" :parameters="$parameters" />
<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex h-full flex-col md:flex-row gap-8"> <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex flex-col h-full gap-8 md:flex-row">
<div class="flex md:flex-col gap-4 flex-row"> <div class="flex flex-row gap-4 md:flex-col">
<a :class="activeTab === 'managed' && 'dark:text-white'" <a :class="activeTab === 'managed' && 'dark:text-white'"
@click.prevent="activeTab = 'managed'; window.location.hash = 'managed'" href="#">Managed</a> @click.prevent="activeTab = 'managed'; window.location.hash = 'managed'" href="#">Managed</a>
<a :class="activeTab === 'unmanaged' && 'dark:text-white'" <a :class="activeTab === 'unmanaged' && 'dark:text-white'"

13
resources/views/livewire/tags/deployments.blade.php
View File

@@ -1,14 +1,14 @@
<div wire:poll.1000ms="get_deployments" class="grid grid-cols-1"> <div wire:poll.2000ms="get_deployments" wire:init='get_deployments'>
@forelse ($deployments_per_tag_per_server as $server_name => $deployments) @forelse ($deployments_per_tag_per_server as $server_name => $deployments)
<h4 class="py-4">{{ $server_name }}</h4> <h4 class="py-4">{{ $server_name }}</h4>
<div class="grid grid-cols-1 gap-2 lg:grid-cols-3"> <div class="grid grid-cols-1 gap-2">
@foreach ($deployments as $deployment) @foreach ($deployments as $deployment)
<div @class([ <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
'box-without-bg dark:bg-coolgray-100 bg-white gap-2 cursor-pointer group border-l-2 border-dotted', 'box-without-bg-without-border dark:bg-coolgray-100 bg-white gap-2 cursor-pointer group border-l-2',
'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued', 'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
'border-yellow-500' => data_get($deployment, 'status') === 'in_progress', 'dark:border-yellow-500' =>
data_get($deployment, 'status') === 'in_progress',
])> ])>
<a href="{{ data_get($deployment, 'deployment_url') }}">
<div class="flex flex-col mx-6"> <div class="flex flex-col mx-6">
<div class="box-title"> <div class="box-title">
{{ data_get($deployment, 'application_name') }} {{ data_get($deployment, 'application_name') }}
@@ -19,7 +19,6 @@
</div> </div>
<div class="flex-1"></div> <div class="flex-1"></div>
</a> </a>
</div>
@endforeach @endforeach
</div> </div>
@empty @empty

2
resources/views/livewire/tags/index.blade.php
View File

@@ -2,7 +2,7 @@
<h1>Tags</h1> <h1>Tags</h1>
<div class="flex flex-col pb-6 "> <div class="flex flex-col pb-6 ">
<div class="subtitle">Tags help you to perform actions on multiple resources.</div> <div class="subtitle">Tags help you to perform actions on multiple resources.</div>
<div class="flex flex-wrap gap-2"> <div class="">
@if ($tags->count() === 0) @if ($tags->count() === 0)
<div>No tags yet defined yet. Go to a resource and add a tag there.</div> <div>No tags yet defined yet. Go to a resource and add a tag there.</div>
@else @else

2
resources/views/livewire/upgrade.blade.php
View File

@@ -10,7 +10,7 @@
<path stroke="none" d="M0 0h24v24H0z" fill="none" /> <path stroke="none" d="M0 0h24v24H0z" fill="none" />
<path d="M19.5 13.572l-7.5 7.428l-7.5 -7.428m0 0a5 5 0 1 1 7.5 -6.566a5 5 0 1 1 7.5 6.572" /> <path d="M19.5 13.572l-7.5 7.428l-7.5 -7.428m0 0a5 5 0 1 1 7.5 -6.566a5 5 0 1 1 7.5 6.572" />
</svg> </svg>
Inprogress In progress
@else @else
<svg xmlns="http://www.w3.org/2000/svg" <svg xmlns="http://www.w3.org/2000/svg"
class="w-6 h-6 text-pink-500 transition-colors hover:text-pink-300" viewBox="0 0 24 24" class="w-6 h-6 text-pink-500 transition-colors hover:text-pink-300" viewBox="0 0 24 24"

7
scripts/install.sh
View File

@@ -12,6 +12,11 @@ DOCKER_VERSION="24.0"
CDN="https://cdn.coollabs.io/coolify" CDN="https://cdn.coollabs.io/coolify"
OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"') OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
# Check if the OS is manjaro, if so, change it to arch
if [ "$OS_TYPE" = "manjaro" ]; then
OS_TYPE="arch"
fi
if [ "$OS_TYPE" = "arch" ]; then if [ "$OS_TYPE" = "arch" ]; then
OS_VERSION="rolling" OS_VERSION="rolling"
else else
@@ -255,7 +260,7 @@ fi
echo -e "-------------" echo -e "-------------"
mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance} mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,metrics,logs}
mkdir -p /data/coolify/ssh/{keys,mux} mkdir -p /data/coolify/ssh/{keys,mux}
mkdir -p /data/coolify/proxy/dynamic mkdir -p /data/coolify/proxy/dynamic

1
templates/compose/appwrite.yaml
View File

@@ -11,7 +11,6 @@ x-logging: &x-logging
options: options:
max-file: '5' max-file: '5'
max-size: '10m' max-size: '10m'
version: '3'
services: services:
appwrite: appwrite:

2
templates/compose/authentik.yaml
View File

@@ -4,8 +4,6 @@
# logo: svgs/authentik.png # logo: svgs/authentik.png
# port: 9000 # port: 9000
version: "3.4"
services: services:
postgresql: postgresql:
image: docker.io/library/postgres:12-alpine image: docker.io/library/postgres:12-alpine

1
templates/compose/glitchtip.yaml
View File

@@ -4,7 +4,6 @@
# logo: svgs/glitchtip.png # logo: svgs/glitchtip.png
# port: 8080 # port: 8080
version: "3.8"
services: services:
postgres: postgres:
image: postgres:16-alpine image: postgres:16-alpine

56
templates/compose/listmonk.yaml Normal file
View File

@@ -0,0 +1,56 @@
# documentation: https://listmonk.app/
# slogan: Self-hosted newsletter and mailing list manager
# tags: newsletter, mailing list, self-hosted, open source
# logo: svgs/listmonk.svg
# port: 9000
services:
listmonk:
image: listmonk/listmonk:latest
environment:
- SERVICE_FQDN_LISTMONK_9000
- LISTMONK_app__address=0.0.0.0:9000
- LISTMONK_db__host=postgres
- LISTMONK_db__name=listmonk
- LISTMONK_db__user=$SERVICE_USER_POSTGRES
- LISTMONK_db__password=$SERVICE_PASSWORD_POSTGRES
- LISTMONK_db__port=5432
- LISTMONK_app__admin_username=admin
- LISTMONK_app__admin_password=$SERVICE_PASSWORD_ADMIN
- TZ=Etc/UTC
volumes:
- "listmonk-data:/listmonk/uploads"
depends_on:
postgres:
condition: service_healthy
healthcheck:
test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:9000"]
interval: 5s
timeout: 20s
retries: 10
listmonk-initial-database-setup:
image: listmonk/listmonk:latest
command: "./listmonk --install --yes --idempotent"
restart: "no"
depends_on:
postgres:
condition: service_healthy
environment:
- LISTMONK_db__host=postgres
- LISTMONK_db__name=listmonk
- LISTMONK_db__user=$SERVICE_USER_POSTGRES
- LISTMONK_db__password=$SERVICE_PASSWORD_POSTGRES
- LISTMONK_db__port=5432
postgres:
image: "postgres:latest"
environment:
- POSTGRES_DB=listmonk
- POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
- POSTGRES_USER=$SERVICE_USER_POSTGRES
volumes:
- "pg-data:/var/lib/postgresql/data"
healthcheck:
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
interval: 5s
timeout: 20s
retries: 10

1
templates/compose/penpot.yaml
View File

@@ -2,7 +2,6 @@
# slogan: Penpot is the first Open Source design and prototyping platform for product teams. # slogan: Penpot is the first Open Source design and prototyping platform for product teams.
# tags: penpot,design,prototyping,figma,open,source # tags: penpot,design,prototyping,figma,open,source
version: "3.5"
services: services:
frontend: frontend:
image: "penpotapp/frontend:latest" image: "penpotapp/frontend:latest"

1
templates/compose/plausible.yaml
View File

@@ -4,7 +4,6 @@
# tags: analytics, privacy, google, alternative # tags: analytics, privacy, google, alternative
# port: 8000 # port: 8000
version: "3.3"
services: services:
plausible: plausible:
image: plausible/analytics:v2.0 image: plausible/analytics:v2.0

22
templates/service-templates.json
View File

File diff suppressed because one or more lines are too long

5
versions.json
View File

@@ -1,7 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.276" "version": "4.0.0-beta.277"
},
"sentinel": {
"version": "0.0.4"
} }
} }
} }