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

Merge branch 'next' into feat/api-services-create-custom-compose

Browse Source
This commit is contained in:
Andras Bacsai
2025-03-21 11:33:06 +01:00
committed by GitHub
parent 120facfca3 e0e54d6d82
commit 2ec3af8d2c
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Server.php
View File

@@ -484,7 +484,7 @@ $schema://$host {
$base_path = config('constants.coolify.base_config_path'); $base_path = config('constants.coolify.base_config_path');
$proxyType = $this->proxyType(); $proxyType = $this->proxyType();
$proxy_path = "$base_path/proxy"; $proxy_path = "$base_path/proxy";
// TODO: should use /traefik for already exisiting configurations? // TODO: should use /traefik for already existing configurations?
// Should move everything except /caddy and /nginx to /traefik // Should move everything except /caddy and /nginx to /traefik
// The code needs to be modified as well, so maybe it does not worth it // The code needs to be modified as well, so maybe it does not worth it
if ($proxyType === ProxyTypes::TRAEFIK->value) { if ($proxyType === ProxyTypes::TRAEFIK->value) {

4
resources/views/livewire/project/application/general.blade.php
View File

@@ -310,7 +310,7 @@
helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off." helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
id="application.settings.is_container_label_escape_enabled" instantSave></x-forms.checkbox> id="application.settings.is_container_label_escape_enabled" instantSave></x-forms.checkbox>
{{-- <x-forms.checkbox label="Readonly labels" {{-- <x-forms.checkbox label="Readonly labels"
helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenrate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenrate the labels for you (ofc you can always reset the labels to the coolify defaults manually)." helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
id="application.settings.is_container_label_readonly_enabled" instantSave></x-forms.checkbox> --}} id="application.settings.is_container_label_readonly_enabled" instantSave></x-forms.checkbox> --}}
</div> </div>
@endif @endif
@@ -349,7 +349,7 @@
@endif @endif
<div class="w-96"> <div class="w-96">
<x-forms.checkbox label="Readonly labels" <x-forms.checkbox label="Readonly labels"
helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenrate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenrate the labels for you (ofc you can always reset the labels to the coolify defaults manually)." helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
id="application.settings.is_container_label_readonly_enabled" instantSave></x-forms.checkbox> id="application.settings.is_container_label_readonly_enabled" instantSave></x-forms.checkbox>
<x-forms.checkbox label="Escape special characters in labels?" <x-forms.checkbox label="Escape special characters in labels?"
helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off." helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."

2
resources/views/livewire/project/shared/tags.blade.php
View File

@@ -25,7 +25,7 @@
</div> </div>
@endif @endif
@if (count($filteredTags) > 0) @if (count($filteredTags) > 0)
<h3 class="pt-4">Exisiting Tags</h3> <h3 class="pt-4">Existing Tags</h3>
<div>Click to add quickly</div> <div>Click to add quickly</div>
<div class="flex flex-wrap gap-2 pt-4"> <div class="flex flex-wrap gap-2 pt-4">
@foreach ($filteredTags as $tag) @foreach ($filteredTags as $tag)

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

@@ -12,7 +12,7 @@
@if ($server->id === 0) @if ($server->id === 0)
<x-modal-confirmation title="Confirm Server Settings Change?" buttonTitle="Save" <x-modal-confirmation title="Confirm Server Settings Change?" buttonTitle="Save"
submitAction="submit" :actions="[ submitAction="submit" :actions="[
'If you missconfigure the server, you could lose a lot of functionalities of Coolify.', 'If you misconfigure the server, you could lose a lot of functionalities of Coolify.',
]" :confirmWithText="false" :confirmWithPassword="false" ]" :confirmWithText="false" :confirmWithPassword="false"
step2ButtonText="Save" /> step2ButtonText="Save" />
@else @else

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

@@ -141,7 +141,7 @@
<x-modal-confirmation title="Disable Two Step Confirmation?" <x-modal-confirmation title="Disable Two Step Confirmation?"
buttonTitle="Disable Two Step Confirmation" isErrorButton submitAction="toggleTwoStepConfirmation" buttonTitle="Disable Two Step Confirmation" isErrorButton submitAction="toggleTwoStepConfirmation"
:actions="[ :actions="[
'Two Step confimation will be disabled globally.', 'Two Step confirmation will be disabled globally.',
'Disabling two step confirmation reduces security (as anyone can easily delete anything).', 'Disabling two step confirmation reduces security (as anyone can easily delete anything).',
'The risk of accidental actions will increase.', 'The risk of accidental actions will increase.',
]" confirmationText="DISABLE TWO STEP CONFIRMATION" ]" confirmationText="DISABLE TWO STEP CONFIRMATION"