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

Merge pull request #5457 from coollabsio/next

Browse Source 
v4.0.0-beta.401
This commit is contained in:
Andras Bacsai
2025-03-28 22:18:41 +01:00
committed by GitHub
parent 4dc46b45b9 d124abef2f
commit 4c9878d753
18 changed files with 202 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,6 @@ class FileStorage extends Component
$this->workdir = null; $this->workdir = null;
$this->fs_path = $this->fileStorage->fs_path; $this->fs_path = $this->fileStorage->fs_path;
} }
$this->fileStorage->loadStorageOnServer();
} }
public function convertToDirectory() public function convertToDirectory()
@@ -68,6 +67,18 @@ class FileStorage extends Component
} }
} }
public function loadStorageOnServer()
{
try {
$this->fileStorage->loadStorageOnServer();
$this->dispatch('success', 'File storage loaded from server.');
} catch (\Throwable $e) {
return handleError($e, $this);
} finally {
$this->dispatch('refreshStorages');
}
}
public function convertToFile() public function convertToFile()
{ {
try { try {

1
app/Livewire/Server/Proxy/Deploy.php
View File

@@ -65,7 +65,6 @@ class Deploy extends Component
public function restart() public function restart()
{ {
try { try {
$this->stop();
$this->dispatch('checkProxy'); $this->dispatch('checkProxy');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);

2
app/Livewire/SettingsEmail.php
View File

@@ -235,7 +235,7 @@ class SettingsEmail extends Component
throw new \Exception('Too many messages sent!'); throw new \Exception('Too many messages sent!');
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e); return handleError($e, $this);
} }
} }
} }

15
app/Models/LocalFileVolume.php
View File

@@ -176,4 +176,19 @@ class LocalFileVolume extends BaseModel
return instant_remote_process($commands, $server); return instant_remote_process($commands, $server);
} }
// Accessor for convenient access
protected function plainMountPath(): Attribute
{
return Attribute::make(
get: fn () => $this->mount_path,
set: fn ($value) => $this->mount_path = $value
);
}
// Scope for searching
public function scopeWherePlainMountPath($query, $path)
{
return $query->get()->where('plain_mount_path', $path);
}
} }

105
app/Notifications/Channels/EmailChannel.php
View File

@@ -2,69 +2,68 @@
namespace App\Notifications\Channels; namespace App\Notifications\Channels;
use App\Services\ConfigurationRepository;
use Exception;
use Illuminate\Mail\Message;
use Illuminate\Notifications\Notification; use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\Mail; use Resend;
class EmailChannel class EmailChannel
{ {
private ConfigurationRepository $configRepository; public function __construct() {}
public function __construct(ConfigurationRepository $configRepository)
{
$this->configRepository = $configRepository;
}
public function send(SendsEmail $notifiable, Notification $notification): void public function send(SendsEmail $notifiable, Notification $notification): void
{ {
try { $useInstanceEmailSettings = $notifiable->emailNotificationSettings->use_instance_email_settings;
$this->bootConfigs($notifiable); $customEmails = data_get($notification, 'emails', null);
if ($useInstanceEmailSettings) {
$settings = instanceSettings();
} else {
$settings = $notifiable->emailNotificationSettings;
}
$isResendEnabled = $settings->resend_enabled;
$isSmtpEnabled = $settings->smtp_enabled;
if ($customEmails) {
$recipients = [$customEmails];
} else {
$recipients = $notifiable->getRecipients(); $recipients = $notifiable->getRecipients();
if (count($recipients) === 0) { }
throw new Exception('No email recipients found'); $mailMessage = $notification->toMail($notifiable);
}
$mailMessage = $notification->toMail($notifiable); if ($isResendEnabled) {
Mail::send( $resend = Resend::client($settings->resend_api_key);
[], $from = "{$settings->smtp_from_name} <{$settings->smtp_from_address}>";
[], $resend->emails->send([
fn (Message $message) => $message 'from' => $from,
->to($recipients) 'to' => $recipients,
->subject($mailMessage->subject) 'subject' => $mailMessage->subject,
->html((string) $mailMessage->render()) 'html' => (string) $mailMessage->render(),
]);
} elseif ($isSmtpEnabled) {
$encryption = match (strtolower($settings->smtp_encryption)) {
'starttls' => null,
'tls' => 'tls',
'none' => null,
default => null,
};
$transport = new \Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport(
$settings->smtp_host,
$settings->smtp_port,
$encryption
); );
} catch (Exception $e) { $transport->setUsername($settings->smtp_username);
$error = $e->getMessage(); $transport->setPassword($settings->smtp_password);
if ($error === 'No email settings found.') {
throw $e; $mailer = new \Symfony\Component\Mailer\Mailer($transport);
}
$message = "EmailChannel error: {$e->getMessage()}. Failed to send email to:"; $fromEmail = $settings->smtp_from_address ?? 'noreply@localhost';
if (isset($recipients)) { $fromName = $settings->smtp_from_name ?? 'System';
$message .= implode(', ', $recipients); $from = new \Symfony\Component\Mime\Address($fromEmail, $fromName);
} $email = (new \Symfony\Component\Mime\Email)
if (isset($mailMessage)) { ->from($from)
$message .= " with subject: {$mailMessage->subject}"; ->to(...$recipients)
} ->subject($mailMessage->subject)
send_internal_notification($message); ->html((string) $mailMessage->render());
throw $e;
$mailer->send($email);
} }
} }
private function bootConfigs($notifiable): void
{
$emailSettings = $notifiable->emailNotificationSettings;
if ($emailSettings->use_instance_email_settings) {
$type = set_transanctional_email_settings();
if (blank($type)) {
throw new Exception('No email settings found.');
}
return;
}
$this->configRepository->updateMailConfig($emailSettings);
}
} }

11
bootstrap/helpers/docker.php
View File

@@ -8,6 +8,7 @@ use App\Models\ServiceApplication;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Spatie\Url\Url; use Spatie\Url\Url;
use Symfony\Component\Yaml\Yaml;
use Visus\Cuid2\Cuid2; use Visus\Cuid2\Cuid2;
function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null, ?bool $includePullrequests = false): Collection function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null, ?bool $includePullrequests = false): Collection
@@ -834,7 +835,15 @@ function validateComposeFile(string $compose, int $server_id): string|Throwable
if (! $server) { if (! $server) {
throw new \Exception('Server not found'); throw new \Exception('Server not found');
} }
$base64_compose = base64_encode($compose); $yaml_compose = Yaml::parse($compose);
foreach ($yaml_compose['services'] as $service_name => $service) {
foreach ($service['volumes'] as $volume_name => $volume) {
if (data_get($volume, 'type') === 'bind' && data_get($volume, 'content')) {
unset($yaml_compose['services'][$service_name]['volumes'][$volume_name]['content']);
}
}
}
$base64_compose = base64_encode(Yaml::dump($yaml_compose));
instant_remote_process([ instant_remote_process([
"echo {$base64_compose} | base64 -d | tee /tmp/{$uuid}.yml > /dev/null", "echo {$base64_compose} | base64 -d | tee /tmp/{$uuid}.yml > /dev/null",
"chmod 600 /tmp/{$uuid}.yml", "chmod 600 /tmp/{$uuid}.yml",

89
bootstrap/helpers/shared.php
View File

@@ -1250,13 +1250,23 @@ function get_public_ips()
function isAnyDeploymentInprogress() function isAnyDeploymentInprogress()
{ {
$runningJobs = ApplicationDeploymentQueue::where('horizon_job_worker', gethostname())->where('status', ApplicationDeploymentStatus::IN_PROGRESS->value)->get(); $runningJobs = ApplicationDeploymentQueue::where('horizon_job_worker', gethostname())->where('status', ApplicationDeploymentStatus::IN_PROGRESS->value)->get();
$basicDetails = $runningJobs->map(function ($job) {
return [
'id' => $job->id,
'created_at' => $job->created_at,
'application_id' => $job->application_id,
'server_id' => $job->server_id,
'horizon_job_id' => $job->horizon_job_id,
'status' => $job->status,
];
});
echo 'Running jobs: '.json_encode($basicDetails)."\n";
$horizonJobIds = []; $horizonJobIds = [];
foreach ($runningJobs as $runningJob) { foreach ($runningJobs as $runningJob) {
$horizonJobStatus = getJobStatus($runningJob->horizon_job_id); $horizonJobStatus = getJobStatus($runningJob->horizon_job_id);
if ($horizonJobStatus === 'unknown') { if ($horizonJobStatus === 'unknown' || $horizonJobStatus === 'reserved') {
return true; $horizonJobIds[] = $runningJob->horizon_job_id;
} }
$horizonJobIds[] = $runningJob->horizon_job_id;
} }
if (count($horizonJobIds) === 0) { if (count($horizonJobIds) === 0) {
echo "No deployments in progress.\n"; echo "No deployments in progress.\n";
@@ -1353,21 +1363,15 @@ function parseServiceVolumes($serviceVolumes, $resource, $topLevelVolumes, $pull
$source = $source."-pr-$pull_request_id"; $source = $source."-pr-$pull_request_id";
} }
if (! $resource?->settings?->is_preserve_repository_enabled || $foundConfig?->is_based_on_git) { if (! $resource?->settings?->is_preserve_repository_enabled || $foundConfig?->is_based_on_git) {
LocalFileVolume::updateOrCreate( $volume = LocalFileVolume::wherePlainMountPath($target)->first() ?? new LocalFileVolume;
[ $volume->fill([
'mount_path' => $target, 'fs_path' => $source,
'resource_id' => $resource->id, 'mount_path' => $target,
'resource_type' => get_class($resource), 'content' => $content,
], 'is_directory' => $isDirectory,
[ 'resource_id' => $resource->id,
'fs_path' => $source, 'resource_type' => get_class($resource),
'mount_path' => $target, ])->save();
'content' => $content,
'is_directory' => $isDirectory,
'resource_id' => $resource->id,
'resource_type' => get_class($resource),
]
);
} }
} elseif ($type->value() === 'volume') { } elseif ($type->value() === 'volume') {
if ($topLevelVolumes->has($source->value())) { if ($topLevelVolumes->has($source->value())) {
@@ -1665,21 +1669,28 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
if ($source->value() === '/tmp' || $source->value() === '/tmp/') { if ($source->value() === '/tmp' || $source->value() === '/tmp/') {
return $volume; return $volume;
} }
LocalFileVolume::updateOrCreate(
[ $existingVolume = LocalFileVolume::wherePlainMountPath($target)->first();
'mount_path' => $target,
'resource_id' => $savedService->id, if ($existingVolume) {
'resource_type' => get_class($savedService), $existingVolume->update([
],
[
'fs_path' => $source, 'fs_path' => $source,
'mount_path' => $target, 'mount_path' => $target,
'content' => $content, 'content' => $content,
'is_directory' => $isDirectory, 'is_directory' => $isDirectory,
'resource_id' => $savedService->id, 'resource_id' => $savedService->id,
'resource_type' => get_class($savedService), 'resource_type' => get_class($savedService),
] ]);
); } else {
LocalFileVolume::create([
'fs_path' => $source,
'mount_path' => $target,
'content' => $content,
'is_directory' => $isDirectory,
'resource_id' => $savedService->id,
'resource_type' => get_class($savedService),
]);
}
} elseif ($type->value() === 'volume') { } elseif ($type->value() === 'volume') {
if ($topLevelVolumes->has($source->value())) { if ($topLevelVolumes->has($source->value())) {
$v = $topLevelVolumes->get($source->value()); $v = $topLevelVolumes->get($source->value());
@@ -3317,21 +3328,15 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
if ($isApplication && $isPullRequest) { if ($isApplication && $isPullRequest) {
$source = $source."-pr-$pullRequestId"; $source = $source."-pr-$pullRequestId";
} }
LocalFileVolume::updateOrCreate( $volume = LocalFileVolume::wherePlainMountPath($target)->first() ?? new LocalFileVolume;
[ $volume->fill([
'mount_path' => $target, 'fs_path' => $source,
'resource_id' => $originalResource->id, 'mount_path' => $target,
'resource_type' => get_class($originalResource), 'content' => $content,
], 'is_directory' => $isDirectory,
[ 'resource_id' => $originalResource->id,
'fs_path' => $source, 'resource_type' => get_class($originalResource),
'mount_path' => $target, ])->save();
'content' => $content,
'is_directory' => $isDirectory,
'resource_id' => $originalResource->id,
'resource_type' => get_class($originalResource),
]
);
if (isDev()) { if (isDev()) {
if ((int) $resource->compose_parsing_version >= 4) { if ((int) $resource->compose_parsing_version >= 4) {
if ($isApplication) { if ($isApplication) {

2
config/constants.php
View File

@@ -2,7 +2,7 @@
return [ return [
'coolify' => [ 'coolify' => [
'version' => '4.0.0-beta.400', 'version' => '4.0.0-beta.401',
'helper_version' => '1.0.7', 'helper_version' => '1.0.7',
'realtime_version' => '1.0.6', 'realtime_version' => '1.0.6',
'self_hosted' => env('SELF_HOSTED', true), 'self_hosted' => env('SELF_HOSTED', true),

6
other/nightly/install.sh
View File

@@ -20,7 +20,7 @@ DATE=$(date +"%Y%m%d-%H%M%S")
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 '"')
ENV_FILE="/data/coolify/source/.env" ENV_FILE="/data/coolify/source/.env"
VERSION="19" VERSION="20"
DOCKER_VERSION="27.0" DOCKER_VERSION="27.0"
# TODO: Ask for a user # TODO: Ask for a user
CURRENT_USER=$USER CURRENT_USER=$USER
@@ -803,9 +803,9 @@ echo -e " - Please wait."
getAJoke getAJoke
if [[ $- == *x* ]]; then if [[ $- == *x* ]]; then
bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}"
else else
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}"
fi fi
echo " - Coolify installed successfully." echo " - Coolify installed successfully."
rm -f $ENV_FILE-$DATE rm -f $ENV_FILE-$DATE

3
other/nightly/upgrade.sh
View File

@@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
## Do not modify this file. You will lose the ability to autoupdate! ## Do not modify this file. You will lose the ability to autoupdate!
VERSION="14" VERSION="15"
CDN="https://cdn.coollabs.io/coolify-nightly" CDN="https://cdn.coollabs.io/coolify-nightly"
LATEST_IMAGE=${1:-latest} LATEST_IMAGE=${1:-latest}
LATEST_HELPER_VERSION=${2:-latest} LATEST_HELPER_VERSION=${2:-latest}
REGISTRY_URL=${3:-ghcr.io}
DATE=$(date +%Y-%m-%d-%H-%M-%S) DATE=$(date +%Y-%m-%d-%H-%M-%S)
LOGFILE="/data/coolify/source/upgrade-${DATE}.log" LOGFILE="/data/coolify/source/upgrade-${DATE}.log"

4
other/nightly/versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.400" "version": "4.0.0-beta.401"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.401" "version": "4.0.0-beta.402"
}, },
"helper": { "helper": {
"version": "1.0.7" "version": "1.0.7"

2
resources/views/livewire/notifications/email.blade.php
View File

@@ -14,7 +14,7 @@
<x-modal-input buttonTitle="Send Test Email" title="Send Test Email"> <x-modal-input buttonTitle="Send Test Email" title="Send Test Email">
<form wire:submit.prevent="sendTestEmail" class="flex flex-col w-full gap-2"> <form wire:submit.prevent="sendTestEmail" class="flex flex-col w-full gap-2">
<x-forms.input wire:model="testEmailAddress" placeholder="test@example.com" <x-forms.input wire:model="testEmailAddress" placeholder="test@example.com"
id="testEmailAddress" label="Recipients" required /> id="testEmailAddress" label="Recipient" required />
<x-forms.button type="submit" @click="modalOpen=false"> <x-forms.button type="submit" @click="modalOpen=false">
Send Email Send Email
</x-forms.button> </x-forms.button>

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

@@ -1,16 +1,9 @@
<div class="py-4 "> <div class="">
<div class="flex flex-col justify-center pb-4 text-sm select-text"> <div class="flex flex-col justify-center pb-4 text-sm select-text">
{{-- @if (data_get($resource, 'build_pack') === 'dockercompose') <div class="flex gap-2 md:flex-row flex-col pt-4">
<h4>{{ data_get($resource, 'name', 'unknown') }}</h4> <x-forms.input label="Source Path" :value="$fileStorage->fs_path" readonly />
@endif --}} <x-forms.input label="Destination Path" :value="$fileStorage->mount_path" readonly />
@if ($fileStorage->is_directory) </div>
<h4 class="dark:text-white pt-4 border-t dark:border-coolgray-200">Directory Mount</h4>
@else
<h4 class="dark:text-white pt-4 border-t dark:border-coolgray-200">File Mount</h4>
@endif
<x-forms.input label="Source Path" :value="$fileStorage->fs_path" readonly />
<x-forms.input label="Destination Path" :value="$fileStorage->mount_path" readonly />
</div> </div>
<form wire:submit='submit' class="flex flex-col gap-2"> <form wire:submit='submit' class="flex flex-col gap-2">
<div class="flex gap-2"> <div class="flex gap-2">
@@ -39,6 +32,7 @@
confirmationLabel="Please confirm the execution of the actions by entering the Filepath below" confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" /> shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" />
@endif @endif
<x-forms.button type="button" wire:click="loadStorageOnServer">Load from server</x-forms.button>
<x-modal-confirmation :ignoreWire="false" title="Confirm File Deletion?" buttonTitle="Delete" <x-modal-confirmation :ignoreWire="false" title="Confirm File Deletion?" buttonTitle="Delete"
isErrorButton submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']" isErrorButton submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']"
confirmationText="{{ $fs_path }}" confirmationText="{{ $fs_path }}"

76
resources/views/livewire/project/shared/storages/show.blade.php
View File

@@ -2,45 +2,53 @@
<form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row"> <form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
@if ($isReadOnly) @if ($isReadOnly)
@if ($isFirst) @if ($isFirst)
@if ( <div class="flex gap-2 items-end w-full md:flex-row flex-col">
$storage->resource_type === 'App\Models\ServiceApplication' || @if (
$storage->resource_type === 'App\Models\ServiceDatabase') $storage->resource_type === 'App\Models\ServiceApplication' ||
<x-forms.input id="storage.name" label="Volume Name" required readonly $storage->resource_type === 'App\Models\ServiceDatabase')
helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." /> <x-forms.input id="storage.name" label="Volume Name" required readonly
@else helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
<x-forms.input id="storage.name" label="Volume Name" required @else
helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." /> <x-forms.input id="storage.name" label="Volume Name" required
@endif helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
@if ($isService || $startedAt) @endif
<x-forms.input id="storage.host_path" readonly helper="Directory on the host system." @if ($isService || $startedAt)
label="Source Path" <x-forms.input id="storage.host_path" readonly helper="Directory on the host system."
helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." /> label="Source Path"
<x-forms.input id="storage.mount_path" label="Destination Path" helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
helper="Directory inside the container." required readonly /> <x-forms.input id="storage.mount_path" label="Destination Path"
@else helper="Directory inside the container." required readonly />
<x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path" @else
helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." /> <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path"
<x-forms.input id="storage.mount_path" label="Destination Path" helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
helper="Directory inside the container." required readonly /> <x-forms.input id="storage.mount_path" label="Destination Path"
<x-forms.button type="submit"> helper="Directory inside the container." required readonly />
Update <x-forms.button type="submit">
</x-forms.button> Update
@endif </x-forms.button>
@endif
</div>
@else @else
<x-forms.input id="storage.name" required readonly /> <div class="flex gap-2 items-end w-full">
<x-forms.input id="storage.host_path" readonly /> <x-forms.input id="storage.name" required readonly />
<x-forms.input id="storage.mount_path" required readonly /> <x-forms.input id="storage.host_path" readonly />
<x-forms.input id="storage.mount_path" required readonly />
</div>
@endif @endif
@else @else
@if ($isFirst) @if ($isFirst)
<x-forms.input id="storage.name" label="Volume Name" required /> <div class="flex gap-2 items-end w-full">
<x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path" /> <x-forms.input id="storage.name" label="Volume Name" required />
<x-forms.input id="storage.mount_path" label="Destination Path" helper="Directory inside the container." <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path" />
required /> <x-forms.input id="storage.mount_path" label="Destination Path"
helper="Directory inside the container." required />
</div>
@else @else
<x-forms.input id="storage.name" required /> <div class="flex gap-2 items-end w-full">
<x-forms.input id="storage.host_path" /> <x-forms.input id="storage.name" required />
<x-forms.input id="storage.mount_path" required /> <x-forms.input id="storage.host_path" />
<x-forms.input id="storage.mount_path" required />
</div>
@endif @endif
<div class="flex gap-2"> <div class="flex gap-2">
<x-forms.button type="submit"> <x-forms.button type="submit">

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

@@ -13,7 +13,7 @@
<x-modal-input buttonTitle="Send Test Email" title="Send Test Email"> <x-modal-input buttonTitle="Send Test Email" title="Send Test Email">
<form wire:submit.prevent="sendTestEmail" class="flex flex-col w-full gap-2"> <form wire:submit.prevent="sendTestEmail" class="flex flex-col w-full gap-2">
<x-forms.input wire:model="testEmailAddress" placeholder="test@example.com" id="testEmailAddress" <x-forms.input wire:model="testEmailAddress" placeholder="test@example.com" id="testEmailAddress"
label="Recipients" required /> label="Recipient" required />
<x-forms.button type="submit" @click="modalOpen=false"> <x-forms.button type="submit" @click="modalOpen=false">
Send Email Send Email
</x-forms.button> </x-forms.button>

6
scripts/install.sh
View File

@@ -20,7 +20,7 @@ DATE=$(date +"%Y%m%d-%H%M%S")
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 '"')
ENV_FILE="/data/coolify/source/.env" ENV_FILE="/data/coolify/source/.env"
VERSION="19" VERSION="20"
DOCKER_VERSION="27.0" DOCKER_VERSION="27.0"
# TODO: Ask for a user # TODO: Ask for a user
CURRENT_USER=$USER CURRENT_USER=$USER
@@ -803,9 +803,9 @@ echo -e " - Please wait."
getAJoke getAJoke
if [[ $- == *x* ]]; then if [[ $- == *x* ]]; then
bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}"
else else
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}"
fi fi
echo " - Coolify installed successfully." echo " - Coolify installed successfully."
rm -f $ENV_FILE-$DATE rm -f $ENV_FILE-$DATE

3
scripts/upgrade.sh
View File

@@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
## Do not modify this file. You will lose the ability to autoupdate! ## Do not modify this file. You will lose the ability to autoupdate!
VERSION="14" VERSION="15"
CDN="https://cdn.coollabs.io/coolify" CDN="https://cdn.coollabs.io/coolify"
LATEST_IMAGE=${1:-latest} LATEST_IMAGE=${1:-latest}
LATEST_HELPER_VERSION=${2:-latest} LATEST_HELPER_VERSION=${2:-latest}
REGISTRY_URL=${3:-ghcr.io}
DATE=$(date +%Y-%m-%d-%H-%M-%S) DATE=$(date +%Y-%m-%d-%H-%M-%S)
LOGFILE="/data/coolify/source/upgrade-${DATE}.log" LOGFILE="/data/coolify/source/upgrade-${DATE}.log"

4
versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.400" "version": "4.0.0-beta.401"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.401" "version": "4.0.0-beta.402"
}, },
"helper": { "helper": {
"version": "1.0.7" "version": "1.0.7"