fix: streamline helper version retrieval and improve migration clarity
This commit is contained in:
Andras Bacsai
parent
c758de9e7c
commit
a660dd8c83
2 changed files with 89 additions and 96 deletions
|
|
@ -2907,8 +2907,7 @@ function getHelperVersion(): string
|
||||||
return $settings->dev_helper_version;
|
return $settings->dev_helper_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
// In production or when dev_helper_version is not set, use the configured helper_version
|
return config('constants.coolify.helper_version');
|
||||||
return $settings->helper_version ?? config('constants.coolify.helper_version');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
|
function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,29 @@
|
||||||
<div>
|
<div>
|
||||||
<x-slot:title>
|
<x-slot:title>
|
||||||
Settings | Coolify
|
Settings | Coolify
|
||||||
</x-slot>
|
</x-slot>
|
||||||
<x-settings.navbar />
|
<x-settings.navbar />
|
||||||
<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
|
<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }"
|
||||||
<x-settings.sidebar activeMenu="general" />
|
class="flex flex-col h-full gap-8 sm:flex-row">
|
||||||
<form wire:submit='submit' class="flex flex-col">
|
<x-settings.sidebar activeMenu="general" />
|
||||||
<div class="flex items-center gap-2">
|
<form wire:submit='submit' class="flex flex-col">
|
||||||
<h2>General</h2>
|
<div class="flex items-center gap-2">
|
||||||
<x-forms.button type="submit">
|
<h2>General</h2>
|
||||||
Save
|
<x-forms.button type="submit">
|
||||||
</x-forms.button>
|
Save
|
||||||
</div>
|
</x-forms.button>
|
||||||
<div class="pb-4">General configuration for your Coolify instance.</div>
|
</div>
|
||||||
|
<div class="pb-4">General configuration for your Coolify instance.</div>
|
||||||
|
|
||||||
<div class="flex flex-col gap-2">
|
<div class="flex flex-col gap-2">
|
||||||
<div class="flex flex-wrap items-end gap-2">
|
<div class="flex flex-wrap items-end gap-2">
|
||||||
<div class="flex gap-2 md:flex-row flex-col w-full">
|
<div class="flex gap-2 md:flex-row flex-col w-full">
|
||||||
<x-forms.input id="fqdn" label="Domain"
|
<x-forms.input id="fqdn" label="Domain"
|
||||||
helper="Enter the full domain name (FQDN) of the instance, including 'https://' if you want to secure the dashboard with HTTPS. Setting this will make the dashboard accessible via this domain, secured by HTTPS, instead of just the IP address."
|
helper="Enter the full domain name (FQDN) of the instance, including 'https://' if you want to secure the dashboard with HTTPS. Setting this will make the dashboard accessible via this domain, secured by HTTPS, instead of just the IP address."
|
||||||
placeholder="https://coolify.yourdomain.com" />
|
placeholder="https://coolify.yourdomain.com" />
|
||||||
<x-forms.input id="instance_name" label="Name" placeholder="Coolify"
|
<x-forms.input id="instance_name" label="Name" placeholder="Coolify"
|
||||||
helper="Custom name for your Coolify instance, shown in the URL." />
|
helper="Custom name for your Coolify instance, shown in the URL." />
|
||||||
<div class="w-full" x-data="{
|
<div class="w-full" x-data="{
|
||||||
open: false,
|
open: false,
|
||||||
search: '{{ $settings->instance_timezone ?: '' }}',
|
search: '{{ $settings->instance_timezone ?: '' }}',
|
||||||
timezones: @js($this->timezones),
|
timezones: @js($this->timezones),
|
||||||
|
|
@ -35,82 +36,75 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}">
|
}">
|
||||||
<div class="flex items-center mb-1">
|
<div class="flex items-center mb-1">
|
||||||
<label for="instance_timezone">Instance
|
<label for="instance_timezone">Instance
|
||||||
Timezone</label>
|
Timezone</label>
|
||||||
<x-helper class="ml-2"
|
<x-helper class="ml-2"
|
||||||
helper="Timezone for the Coolify instance. This is used for the update check and automatic update frequency." />
|
helper="Timezone for the Coolify instance. This is used for the update check and automatic update frequency." />
|
||||||
</div>
|
|
||||||
<div class="relative">
|
|
||||||
<div class="inline-flex relative items-center w-full">
|
|
||||||
<input autocomplete="off"
|
|
||||||
wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
|
|
||||||
wire:dirty.class="dark:focus:ring-warning dark:ring-warning" x-model="search"
|
|
||||||
@focus="open = true" @click.away="open = false" @input="open = true"
|
|
||||||
class="w-full input" :placeholder="placeholder" wire:model="instance_timezone">
|
|
||||||
<svg class="absolute right-0 mr-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg"
|
|
||||||
fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
|
|
||||||
@click="open = true">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round"
|
|
||||||
d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
|
|
||||||
</svg>
|
|
||||||
</div>
|
</div>
|
||||||
<div x-show="open"
|
<div class="relative">
|
||||||
class="overflow-auto overflow-x-hidden absolute z-50 mt-1 w-full max-h-60 bg-white rounded-md border shadow-lg dark:bg-coolgray-100 dark:border-coolgray-200 scrollbar">
|
<div class="inline-flex relative items-center w-full">
|
||||||
<template
|
<input autocomplete="off"
|
||||||
x-for="timezone in timezones.filter(tz => tz.toLowerCase().includes(search.toLowerCase()))"
|
wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
|
||||||
:key="timezone">
|
wire:dirty.class="dark:focus:ring-warning dark:ring-warning"
|
||||||
<div @click="search = timezone; open = false; $wire.set('instance_timezone', timezone); $wire.submit()"
|
x-model="search" @focus="open = true" @click.away="open = false"
|
||||||
class="px-4 py-2 text-gray-800 cursor-pointer hover:bg-gray-100 dark:hover:bg-coolgray-300 dark:text-gray-200"
|
@input="open = true" class="w-full input" :placeholder="placeholder"
|
||||||
x-text="timezone"></div>
|
wire:model="instance_timezone">
|
||||||
</template>
|
<svg class="absolute right-0 mr-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg"
|
||||||
|
fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
|
||||||
|
@click="open = true">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round"
|
||||||
|
d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div x-show="open"
|
||||||
|
class="overflow-auto overflow-x-hidden absolute z-50 mt-1 w-full max-h-60 bg-white rounded-md border shadow-lg dark:bg-coolgray-100 dark:border-coolgray-200 scrollbar">
|
||||||
|
<template
|
||||||
|
x-for="timezone in timezones.filter(tz => tz.toLowerCase().includes(search.toLowerCase()))"
|
||||||
|
:key="timezone">
|
||||||
|
<div @click="search = timezone; open = false; $wire.set('instance_timezone', timezone); $wire.submit()"
|
||||||
|
class="px-4 py-2 text-gray-800 cursor-pointer hover:bg-gray-100 dark:hover:bg-coolgray-300 dark:text-gray-200"
|
||||||
|
x-text="timezone"></div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="flex gap-2 md:flex-row flex-col w-full">
|
||||||
<div class="flex gap-2 md:flex-row flex-col w-full">
|
<x-forms.input id="public_ipv4" type="password" label="Instance's Public IPv4"
|
||||||
<x-forms.input id="public_ipv4" type="password" label="Instance's Public IPv4"
|
helper="Enter the IPv4 address of the instance.<br><br>It is useful if you have several IPv4 addresses and Coolify could not detect the correct one."
|
||||||
helper="Enter the IPv4 address of the instance.<br><br>It is useful if you have several IPv4 addresses and Coolify could not detect the correct one."
|
placeholder="1.2.3.4" autocomplete="new-password" />
|
||||||
placeholder="1.2.3.4" autocomplete="new-password" />
|
<x-forms.input id="public_ipv6" type="password" label="Instance's Public IPv6"
|
||||||
<x-forms.input id="public_ipv6" type="password" label="Instance's Public IPv6"
|
helper="Enter the IPv6 address of the instance.<br><br>It is useful if you have several IPv6 addresses and Coolify could not detect the correct one."
|
||||||
helper="Enter the IPv6 address of the instance.<br><br>It is useful if you have several IPv6 addresses and Coolify could not detect the correct one."
|
placeholder="2001:db8::1" autocomplete="new-password" />
|
||||||
placeholder="2001:db8::1" autocomplete="new-password" />
|
|
||||||
</div>
|
|
||||||
@if(isDev())
|
|
||||||
<div class="flex gap-2 md:flex-row flex-col w-full">
|
|
||||||
<div class="flex-1">
|
|
||||||
<x-forms.input id="dev_helper_version" label="Dev Helper Version (Development Only)"
|
|
||||||
helper="Override the default coolify-helper image version. Leave empty to use the default version from config ({{ config('constants.coolify.helper_version') }}). Examples: 1.0.11, latest, dev"
|
|
||||||
placeholder="{{ config('constants.coolify.helper_version') }}" />
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-end">
|
|
||||||
<x-forms.button wire:click="buildHelperImage" type="button">
|
@if($buildActivityId)
|
||||||
Build Image
|
<div class="w-full mt-4">
|
||||||
</x-forms.button>
|
<livewire:activity-monitor header="Building Helper Image" :activityId="$buildActivityId"
|
||||||
</div>
|
:fullHeight="false" />
|
||||||
</div>
|
</div>
|
||||||
@if($buildActivityId)
|
@endif
|
||||||
<div class="w-full mt-4">
|
@if(isDev())
|
||||||
<livewire:activity-monitor header="Building Helper Image" :activityId="$buildActivityId" :fullHeight="false" />
|
|
||||||
</div>
|
<x-forms.input id="dev_helper_version" label="Dev Helper Version (Development Only)"
|
||||||
@endif
|
helper="Override the default coolify-helper image version. Leave empty to use the default version from config ({{ config('constants.coolify.helper_version') }}). Examples: 1.0.11, latest, dev"
|
||||||
@endif
|
placeholder="{{ config('constants.coolify.helper_version') }}" />
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</form>
|
||||||
</form>
|
|
||||||
|
<x-domain-conflict-modal :conflicts="$domainConflicts" :showModal="$showDomainConflictModal"
|
||||||
<x-domain-conflict-modal
|
confirmAction="confirmDomainUsage">
|
||||||
:conflicts="$domainConflicts"
|
<x-slot:consequences>
|
||||||
:showModal="$showDomainConflictModal"
|
<ul class="mt-2 ml-4 list-disc">
|
||||||
confirmAction="confirmDomainUsage">
|
<li>The Coolify instance domain will conflict with existing resources</li>
|
||||||
<x-slot:consequences>
|
<li>SSL certificates might not work correctly</li>
|
||||||
<ul class="mt-2 ml-4 list-disc">
|
<li>Routing behavior will be unpredictable</li>
|
||||||
<li>The Coolify instance domain will conflict with existing resources</li>
|
<li>You may not be able to access the Coolify dashboard properly</li>
|
||||||
<li>SSL certificates might not work correctly</li>
|
</ul>
|
||||||
<li>Routing behavior will be unpredictable</li>
|
</x-slot:consequences>
|
||||||
<li>You may not be able to access the Coolify dashboard properly</li>
|
</x-domain-conflict-modal>
|
||||||
</ul>
|
</div>
|
||||||
</x-slot:consequences>
|
</div>
|
||||||
</x-domain-conflict-modal>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
Loading…
Reference in a new issue