An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
feat(ui): reorganize resource settings and domain port editing
Andras Bacsai7acfcdff248c
diff --git a/DESIGN.md b/DESIGN.mdindex 708a3db1ce..e06ad51e1c 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -25,12 +25,14 @@ change.- **Layers, not boxes.** Depth comes from a few surface steps (canvas, card,well, control), 1px borders, and very soft shadows. Never use thick borders orheavy floating shadows.-- **Card and well.** Content sits in a darker inset panel (the well) inside a- soft outer box with a small title row.+- **Card and well.** Content sits in an inset panel (the well) inside a soft+ outer box with a small title row. In light mode the well is lighter than the+ outer box. In dark mode a top-level card is a near-canvas outer box with a+ lighter `#121212` well.- **Tactile buttons.** Buttons and navigation icon tiles have a 2px bottomedge. They lift 1px on hover and press down on click.- **Dark gray, not black.** Dark mode page canvas and the top bar are neutral- sRGB 10,10,10 (`#0a0a0a`). Cards sit one step up (`#121212`). Light mode is+ sRGB 10,10,10 (`#0a0a0a`). Card wells sit one step up (`#121212`). Light mode ispure neutral gray.- **One accent.** Coolify purple in both themes (`#6b16ed`, hover `#7317ff`,pressed `#5a12c7`, depth `#4a0fa3`, light text and icons `#a391ff`). Yellow@@ -190,9 +192,10 @@ Class names below are examples. Keep the values and structure.- Three layers: the canvas (page and sidebar, `--ui-canvas`), the top headerbar (`--ui-panel`, 48px high), and the cards on the canvas.-- In dark mode, the header bar, the outer box of a top-level card, and the- header row of a table use the same color (`--ui-panel`). The card wells and- table rows are the darker content layer below them.+- In dark mode, the outer box of a top-level card is+ `color-mix(in srgb, var(--ui-panel) 66%, black)` (about `#0c0c0c`), and its+ well is `--ui-panel` (`#121212`). Tables use the same pair: the darker mix+ for the header row and `--ui-panel` for the rows.- In light mode the sidebar is the canvas color and has a 1px`--ui-chrome-border` right edge. In dark mode the sidebar column, includingthe logo cell, is `#120e1a` with a faint lavender right edge@@ -298,7 +301,8 @@ Class names below are examples. Keep the values and structure.background: var(--ui-card-bg); box-shadow: var(--ui-card-shadow);overflow: visible; /* menus and tooltips must escape */}-.dark .card { background: var(--ui-panel); } /* top-level card: same as the header bar */+.dark .card { background: color-mix(in srgb, var(--ui-panel) 66%, black); box-shadow: none; } /* top-level card */+.dark .card > .card-well { background: var(--ui-panel); box-shadow: none; } /* top-level well */.card-header {display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between;gap: 16px; padding: 4px 8px 10px;@@ -389,12 +393,11 @@ Class names below are examples. Keep the values and structure.### Tables- Header row: 40px, 13px medium, `--ui-fg-faint`, and a 1px `--ui-divider`- bottom border. Fill: `rgb(0 0 0 / 2%)` in light mode, `--ui-panel` in dark- mode (the same as the header bar and the card outer box).-- Dark mode rows use the card well color- (`color-mix(in srgb, var(--ui-panel) 66%, black)`, the same as- `--ui-well-bg` over the panel), so a table looks like a card: header on- top, content below.+ bottom border. Fill: `rgb(0 0 0 / 2%)` in light mode,+ `color-mix(in srgb, var(--ui-panel) 66%, black)` in dark mode (the same as+ the card outer box).+- Dark mode rows use the card well color (`--ui-panel`, `#121212`), so a+ table looks like a card: header on top, content below.- Data rows: about 48px, 10px 16px padding, a 1px divider, and a faint hoverfill. Put the row action at the far right.- Toolbar on top (search left; filter, sort, and add right), pagination in the@@ -441,7 +444,8 @@ Class names below are examples. Keep the values and structure.- Modals use the card anatomy (outer box, title row, well), size to theircontent on desktop, and put the actions on the right below a divider. Use- `--ui-modal-shadow`.+ `--ui-modal-shadow`. In dark mode the edge is only the 1px card border, with+ no extra hairline ring outside it.- Toasts are compact cards (max width 26rem) with a status icon tile, a title,an optional description, and a dismiss button. They close after 4 secondsand pause on hover.@@ -534,7 +538,7 @@ The interface is compact and product-focused:- near-neutral layered surfaces instead of large bordered boxes;- 13–14px UI typography and 32px controls;-- layer cards are a soft outer box around a darker inset well (see section 5),+- layer cards are a soft outer box around an inset well (see section 5),with 1px borders and a restrained `0 1px 2px rgb(0 0 0 / 0.05)` lift, neverheavy borders or a strong floating shadow;- full-width data tables for dense collections;@@ -652,7 +656,7 @@ lift off the content:in light. It has no bottom border until the page scrolls under it. Scrollingadds `is-scrolled` on `<html>` (see `layouts/app.blade.php`) and the dark barbecomes `rgb(10 10 10 / 0.72)` with blur and a lavender hairline. In dark- mode, top-level cards and table header rows use `--color-card` (`#121212`),+ mode, top-level card wells and table rows use `--color-card` (`#121212`),not the top bar.- **Desktop sidebar and the topbar brand block** (Coolify name and version)use the canvas color in light mode. In dark mode they use `--color-sidebar`@@ -692,8 +696,8 @@ The only intentional color is the purple brand accent. Yellow is for warnings.the restrained card lift. In dark mode these shells are painted like layercards. A tile, a separate pagination bar, or an empty box is a card without awell, so it is `--color-card` (`#121212`). A table (a shell whose first child is a- `border-b` header row) has a `--color-card` header row and rows in the well- color (`color-mix(in srgb, var(--color-panel) 66%, black)`).+ `border-b` header row) has a header row in the card outer color+ (`color-mix(in srgb, var(--color-card) 66%, black)`) and `--color-card` rows.These rules match the Tailwind classes in `resources/css/app.css`, becausethe table shells are copied markup without a shared class.@@ -953,12 +957,14 @@ Anatomy:- soft outer box: 12px radius, 1px border, 6px padding, faint fill(`rgb(0 0 0 / 0.75%)` light). In dark mode a top-level card is- `--color-panel`, the same as the topbar; a nested card keeps+ `color-mix(in srgb, var(--color-card) 66%, black)` and its well is+ `--color-card` (`#121212`); a nested card keeps`rgb(255 255 255 / 6%)` over its parent;- small title row on the outer box (13px semibold title, 11px description andheader links), no divider below it;-- body is an inset well: 8px radius, 1px border, white in light and- `rgb(0 0 0 / 34%)` in dark;+- body is an inset well: 8px radius, 1px border, white in light,+ `--color-card` in a dark top-level card, and `rgb(0 0 0 / 34%)` in a dark+ nested card;- 16px body padding;- optional `flush` mode for full-bleed tables;- card-level actions belong in the header slot;@@ -976,9 +982,9 @@ Some pages put a well (`.application-settings-section-body`) directly on thepage without a card, for example the domains and environment variable tables.The well colors are defined on the well itself as well as on the card, so astandalone well keeps its background and border. In dark mode a standalone well-uses the card outer-box surface (`--card-bg`, `--card-border`) instead of the-black well fill, because the black fill directly on the canvas is darker than-the page. An `x-empty` inside a+matches a top-level card: its content is `--color-card` (`#121212`), and a+table header row in it is the darker card outer color+(`color-mix(in srgb, var(--color-card) 66%, black)`). An `x-empty` inside astandalone well shows only its centered text, as it does inside a card.Inside the dark well, controls use a darker translucent fill and borderdiff --git a/app/Livewire/Project/Application/Domains.php b/app/Livewire/Project/Application/Domains.phpindex bd4768e260..118ba4461c 100644--- a/app/Livewire/Project/Application/Domains.php+++ b/app/Livewire/Project/Application/Domains.php@@ -78,7 +78,10 @@ class Domains extends Componentpublic ?string $editingGeneratedHost = null;- /** @var array<int, array{url: string, service: ?string, dns_status: string, dns_message: string, expected_ip: ?string, checked_at?: ?string, is_suggested?: bool, suggested_for?: ?string, suggestion_label?: ?string, needs_force_add?: bool, internal_port?: ?int, has_port_override?: bool}> */+ /** The internal port the edited domain uses when its Port field is empty. */+ public ?int $editingInheritedPort = null;++ /** @var array<int, array{url: string, service: ?string, dns_status: string, dns_message: string, expected_ip: ?string, checked_at?: ?string, is_suggested?: bool, suggested_for?: ?string, suggestion_label?: ?string, needs_force_add?: bool, internal_port?: ?int, has_port_override?: bool, inherited_port?: ?int}> */#[Locked]public array $domainRows = [];@@ -561,7 +564,7 @@ class Domains extends Component/*** @param array<string, array{status?: string, message?: string, expected_ip?: ?string, checked_at?: ?string}> $stored- * @return array{url: string, service: ?string, dns_status: string, dns_message: string, expected_ip: ?string, checked_at: ?string, is_suggested: bool, suggested_for: ?string, suggestion_label: ?string, needs_force_add: bool, internal_port: ?int, has_port_override: bool}+ * @return array{url: string, service: ?string, dns_status: string, dns_message: string, expected_ip: ?string, checked_at: ?string, is_suggested: bool, suggested_for: ?string, suggestion_label: ?string, needs_force_add: bool, internal_port: ?int, has_port_override: bool, inherited_port?: ?int}*/protected function domainRowFromStored(string $url, ?string $service, array $stored): array{@@ -574,6 +577,7 @@ class Domains extends Component'service' => $service,'internal_port' => $port['internal_port'],'has_port_override' => $port['has_port_override'],+ 'inherited_port' => $this->inheritedDomainInternalPort($service),'dns_status' => 'pending','dns_message' => 'Not checked yet.','expected_ip' => $this->serverIp,@@ -621,37 +625,35 @@ class Domains extends Component];}+ return [+ 'internal_port' => $this->inheritedDomainInternalPort($service),+ 'has_port_override' => false,+ ];+ }++ /**+ * The internal port a domain uses when it has no per-domain override.+ */+ protected function inheritedDomainInternalPort(?string $service = null): ?int+ {$composePort = dockerComposeServicePort($this->application->docker_compose_raw, $service);if ($composePort !== null) {- return [- 'internal_port' => $composePort,- 'has_port_override' => false,- ];+ return $composePort;}if ($this->isCompose && $service !== null) {- return [- 'internal_port' => null,- 'has_port_override' => false,- ];+ return null;}if ($this->application->settings?->is_static) {- return [- 'internal_port' => 80,- 'has_port_override' => false,- ];+ return 80;}$exposed = $this->application->ports_exposes_array;- $defaultPort = isset($exposed[0]) && is_numeric($exposed[0]) && (int) $exposed[0] > 0++ return isset($exposed[0]) && is_numeric($exposed[0]) && (int) $exposed[0] > 0? (int) $exposed[0]: null;-- return [- 'internal_port' => $defaultPort,- 'has_port_override' => false,- ];}/**@@ -1342,6 +1344,7 @@ class Domains extends Component$this->editingOriginalRedirect = $this->editingRedirect;$this->editingDomainWasRegenerated = false;$this->editingGeneratedHost = null;+ $this->editingInheritedPort = $this->domainRows[$index]['inherited_port'] ?? null;$this->resetEditDomainDnsGate();$this->resetErrorBag('editingDomain');$this->showEditDomainModal = true;@@ -1432,6 +1435,7 @@ class Domains extends Component$this->editingOriginalRedirect = 'both';$this->editingDomainWasRegenerated = false;$this->editingGeneratedHost = null;+ $this->editingInheritedPort = null;$this->resetEditDomainDnsGate();$this->resetErrorBag('editingDomain');if ($this->pendingAction === 'update') {diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.phpindex 0a1fcdfc3d..cfec74df5c 100644--- a/app/Livewire/Project/Application/General.php+++ b/app/Livewire/Project/Application/General.php@@ -137,6 +137,8 @@ class General extends Componentpublic bool $initLoadingCompose = false;+ public bool $networkingModalOpen = false;+public ?string $initialDockerComposeLocation = null;public ?Collection $parsedServices;@@ -820,6 +822,7 @@ class General extends Component$this->validate();$oldPortsExposes = $this->application->ports_exposes;+ $oldCustomNetworkAliases = $this->application->custom_network_aliases;$oldIsContainerLabelEscapeEnabled = $this->application->settings->is_container_label_escape_enabled;$oldDockerComposeLocation = $this->initialDockerComposeLocation;$oldBaseDirectory = $this->application->base_directory;@@ -951,9 +954,10 @@ class General extends Component$this->application->refresh();$dnsCleanup->queueReleaseOfRemovedHostnames($this->application, $previousDnsHostnames, $this->application->team()->id);$this->syncData();- if ($oldPortsExposes !== $this->portsExposes) {+ if ($oldPortsExposes !== $this->application->ports_exposes || $oldCustomNetworkAliases !== $this->application->custom_network_aliases) {$this->dispatch('applicationNetworkingUpdated')->to(InternalAccess::class);}+ $this->networkingModalOpen = false;$showToaster && ! $warning && $this->dispatch('success', 'Application settings updated!');} catch (\Throwable $e) {$this->application->refresh();diff --git a/resources/css/app.css b/resources/css/app.cssindex 46439f4631..544c8831bd 100644--- a/resources/css/app.css+++ b/resources/css/app.css@@ -1908,28 +1908,30 @@ html[data-theme="custom"]:not(.dark) :is(.application-settings-section, .applicabackground: linear-gradient(var(--well-bg), var(--well-bg)), var(--card-underlay);}-/* Dark mode: top-level cards are #121212, a step above the canvas. The top bar- matches the canvas instead (see the brand shell below). */+/* Dark mode: top-level cards are a near-canvas shade (#121212 under 34% black),+ and their well is #121212, a step above it. The top bar matches the canvas+ (see the brand shell below). */.dark :is(.application-settings-section, .empty-state):not(:is(.application-settings-section, .application-settings-section-body) *) {- background: var(--color-card);+ background: color-mix(in srgb, var(--color-card) 66%, black);box-shadow: none;}+.dark :is(.application-settings-section, .empty-state):not(:is(.application-settings-section, .application-settings-section-body) *) > :is(.application-settings-section-body, .empty-state-well) {+ --well-bg: var(--color-card);+ --well-shadow: none;+}+/* Dark mode: collection tiles, pagination bars, and tables match the cards.- A tile is a card without a well. A table (a shell with a header row) takes- the card color on the header row and a darker mix on the rows. */+ A tile is #121212, like a card well. A table (a shell with a header row) has+ #121212 rows and a header row in the darker card outer color. */.dark [class~="rounded-xl"][class~="dark:bg-white/[0.05]"] {background-color: var(--color-card) !important;border-color: rgb(255 255 255 / 0.08) !important;box-shadow: none;}-.dark [class~="rounded-xl"][class~="dark:bg-white/[0.05]"]:has(> [class~="border-b"]:first-child) {- background: color-mix(in srgb, var(--color-card) 66%, black) !important;-}-.dark [class~="rounded-xl"][class~="dark:bg-white/[0.05]"] > [class~="border-b"]:first-child {- background: var(--color-card) !important;+ background: color-mix(in srgb, var(--color-card) 66%, black) !important;}/* Brief accent ring when a settings nav sub-item scrolls a section into view.@@ -1972,6 +1974,12 @@ html[data-theme="custom"]:not(.dark) :is(.application-settings-section, .applicabackground: linear-gradient(var(--card-bg), var(--card-bg)), var(--coollabs-canvas);}+/* Dark mode: the modal markup adds an inline hairline ring outside the card+ border, which reads as a light double edge. Keep only the card border. */+.dark .application-settings-section.application-settings-form {+ box-shadow: var(--shadow-modal) !important;+}+/* Modals size to content on large screens */@media (min-width: 1024px) {.application-settings-section.application-settings-form {@@ -2037,12 +2045,17 @@ html[data-theme="custom"]:not(.dark) :is(.application-settings-section, .applica--coollabs-line: rgb(255 255 255 / 8%);}-/* A well without a card around it sits straight on the canvas. In dark mode its- black fill would make it darker than the page, so it takes the card surface. */+/* A well without a card around it sits straight on the canvas. In dark mode it+ matches a top-level card: #121212 content, and a table header row in the+ darker card outer color. */.dark .application-settings-section-body:not(.application-settings-section *) {- --well-bg: var(--card-bg);+ --well-bg: var(--color-card);--well-border: var(--card-border);- --well-shadow: 0 1px 2px rgb(0 0 0 / 5%);+ --well-shadow: none;+}++.dark .application-settings-section-body:not(.application-settings-section *) .data-table-header {+ background: color-mix(in srgb, var(--color-card) 66%, black);}/* Floating panels in the well must stay opaque: restore the global dark values. */diff --git a/resources/views/components/application/configuration-sidebar.blade.php b/resources/views/components/application/configuration-sidebar.blade.phpindex 8f86e0d217..0040902d0c 100644--- a/resources/views/components/application/configuration-sidebar.blade.php+++ b/resources/views/components/application/configuration-sidebar.blade.php@@ -193,13 +193,8 @@'project.application.configuration' => array_values(array_filter([['id' => 'application-details-section', 'label' => 'Application details'],['id' => 'access-section', 'label' => 'Access'],- ['id' => 'build-pipeline-section', 'label' => 'Build pipeline'],- $isComposeApp ? null : ['id' => 'container-image-section', 'label' => 'Container image'],- $isComposeApp ? null : ['id' => 'networking-section', 'label' => 'Networking'],- $isComposeApp ? null : ['id' => 'runtime-section', 'label' => 'Runtime'],- $isComposeApp ? null : ['id' => 'security-section', 'label' => 'Security'],- ['id' => 'deployment-lifecycle-section', 'label' => 'Deployment lifecycle'],- $isComposeApp ? null : ['id' => 'container-labels-section', 'label' => 'Container labels'],+ ['id' => 'build-pipeline-section', 'label' => 'Build & deploy'],+ $isComposeApp ? null : ['id' => 'container-section', 'label' => 'Container'],])),'project.application.advanced' => array_values(array_filter([['id' => 'advanced-build-section', 'label' => 'Build'],@@ -234,8 +229,7 @@['id' => 'healthcheck-timing-section', 'label' => 'Timing and retries'],],'project.application.resource-operations' => [- ['id' => 'clone-destination-section', 'label' => 'Clone destination'],- ['id' => 'clone-environment-section', 'label' => 'Clone environment'],+ ['id' => 'clone-resource-section', 'label' => 'Clone resource'],['id' => 'move-resource-section', 'label' => 'Move resource'],],];diff --git a/resources/views/components/database/configuration-sidebar.blade.php b/resources/views/components/database/configuration-sidebar.blade.phpindex e7977a0baf..514b71b574 100644--- a/resources/views/components/database/configuration-sidebar.blade.php+++ b/resources/views/components/database/configuration-sidebar.blade.php@@ -48,18 +48,14 @@->values())->filter(fn ($items) => $items->isNotEmpty());- $pageSections = $database->type() === 'standalone-postgresql'- ? [- ['id' => 'database-details-section', 'label' => 'Database details'],- ['id' => 'credentials-section', 'label' => 'Credentials'],- ['id' => 'initialization-section', 'label' => 'Initialization'],- ['id' => 'runtime-network-section', 'label' => 'Runtime and network'],- ['id' => 'public-access-section', 'label' => 'Public access'],- ['id' => 'configuration-section', 'label' => 'Configuration'],- ['id' => 'log-delivery-section', 'label' => 'Log delivery'],- ['id' => 'initialization-scripts-section', 'label' => 'Initialization scripts'],- ]- : [];+ $pageSections = array_values(array_filter([+ ['id' => 'database-details-section', 'label' => 'Database details'],+ $database->type() === 'standalone-sqlite' ? null : ['id' => 'access-section', 'label' => 'Access'],+ ['id' => 'container-section', 'label' => 'Container'],+ $database->type() === 'standalone-postgresql'+ ? ['id' => 'initialization-scripts-section', 'label' => 'Initialization scripts']+ : null,+ ]));@endphp@phpdiff --git a/resources/views/components/forms/domain-input.blade.php b/resources/views/components/forms/domain-input.blade.phpindex 5a4b5f950e..b4f7f720bb 100644--- a/resources/views/components/forms/domain-input.blade.php+++ b/resources/views/components/forms/domain-input.blade.php@@ -3,6 +3,7 @@'errorId' => null,'hostLabel' => 'Domain','hostPlaceholder' => 'app.example.com',+ 'inheritedPortExpression' => null,])<div class="grid gap-4 sm:grid-cols-[8rem_minmax(0,1fr)_8rem]">@@ -42,9 +43,21 @@<label for="{{ $id }}-port" class="mb-0! flex items-center gap-1.5 leading-4">Port</label></div><input id="{{ $id }}-port" type="number" class="input" wire:model="{{ $id }}.port"- placeholder="3000" min="1" max="65535" inputmode="numeric" />+ placeholder="3000" min="1" max="65535" inputmode="numeric"+ @if ($inheritedPortExpression)+ x-bind:placeholder="({{ $inheritedPortExpression }}) ?? ''"+ @endif /></div>+ @if ($inheritedPortExpression)+ <div class="min-w-0 sm:col-span-3"+ x-show="!({{ $inheritedPortExpression }}) && !$wire.{{ $id }}?.port" x-cloak>+ <x-callout type="danger" title="Port is required">+ The proxy cannot route this domain. Enter the port your container listens on in the Port field.+ </x-callout>+ </div>+ @endif+<div class="min-w-0 sm:col-span-3"><div class="mb-1.5 flex h-4 w-full items-center gap-1.5"><label for="{{ $id }}-path" class="mb-0! flex items-center gap-1.5 leading-4">Path</label>diff --git a/resources/views/livewire/project/application/backup/index.blade.php b/resources/views/livewire/project/application/backup/index.blade.phpindex bab72d8ec4..d60651df80 100644--- a/resources/views/livewire/project/application/backup/index.blade.php+++ b/resources/views/livewire/project/application/backup/index.blade.php@@ -157,10 +157,9 @@</div></div>- <div @class([- 'application-settings-section-body w-full',- 'is-flush' => $backups->isNotEmpty(),- ])>+ <x-application.settings-section title="Schedules"+ helper="Persistent volume and directory backup schedules for this application."+ :flush="$backups->isNotEmpty()"><div x-cloak x-show="backups.length > 0 && filteredBackups.length === 0"><x-empty size="sm" title="No backups found"description="No scheduled backups match your search." />@@ -227,7 +226,7 @@description="Add a persistent volume or directory backup schedule to protect application data."icon-name="storages" />@endif- </div>+ </x-application.settings-section></div></div></section>diff --git a/resources/views/livewire/project/application/domains.blade.php b/resources/views/livewire/project/application/domains.blade.phpindex f900c57506..68c42d87b8 100644--- a/resources/views/livewire/project/application/domains.blade.php+++ b/resources/views/livewire/project/application/domains.blade.php@@ -14,7 +14,7 @@domainSearch: '',modalOpen: @js($showEditDomainModal || $editDomainDnsFailed),editingServiceLabel: @js($editingService ?? ''),- openEditDomain(index, domain, parts, service, indexing, redirect) {+ openEditDomain(index, domain, parts, service, indexing, redirect, inheritedPort) {if (index !== undefined) {$wire.set('editingIndex', index, false);$wire.set('editingDomain', domain, false);@@ -26,6 +26,7 @@$wire.set('editingOriginalRedirect', redirect, false);$wire.set('editingDomainWasRegenerated', false, false);$wire.set('editingGeneratedHost', null, false);+ $wire.set('editingInheritedPort', inheritedPort ?? null, false);}this.editingServiceLabel = service ?? $wire.editingService ?? '';this.modalOpen = true;@@ -328,7 +329,8 @@<input type="text" class="input" readonly x-bind:value="editingServiceLabel" /></div>- <x-forms.domain-input id="editingDomainParts" errorId="editingDomain" />+ <x-forms.domain-input id="editingDomainParts" errorId="editingDomain"+ inheritedPortExpression="$wire.editingInheritedPort" />@if ($editDomainDnsFailed)<x-callout type="danger" title="DNS is not pointing to the right IP">diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.phpindex fd1dbe96fc..e507da7897 100644--- a/resources/views/livewire/project/application/general.blade.php+++ b/resources/views/livewire/project/application/general.blade.php@@ -26,7 +26,7 @@</x-application.settings-section>- <x-application.settings-section id="access-section" title="Access" helper="Manage how this application is reached publicly and from the Docker network.">+ <x-application.settings-section id="access-section" title="Access" helper="Manage how this application is reached publicly, who can access it, and how it is reached from the Docker network."><section id="public-access-section" @class(['border-b border-neutral-200 pb-5 dark:border-white/[0.07]' => $buildPack !== 'dockercompose',])>@@ -98,13 +98,84 @@</div></section>+ @if ($buildPack !== 'dockercompose')+ <section id="security-section" class="border-b border-neutral-200 py-5 dark:border-white/[0.07]">+ <h3 class="mb-3 text-sm font-semibold text-black dark:text-fg">Authentication</h3>+ @if ($application->settings->is_container_label_readonly_enabled == false)+ <x-empty size="sm" title="Authentication is managed through labels"+ description="Authentication is managed via manual proxy labels. Switch label management back to Coolify to configure it here."+ icon-name="admin">+ <x-slot:contents>+ <button type="button" class="button"+ @click="window.scrollToSettingsSection?.('container-labels-section')">+ Go to Container labels+ </button>+ </x-slot:contents>+ </x-empty>+ @else+ <x-forms.listbox id="isHttpBasicAuthEnabled" label="Method" onChange="instantSave"+ helper="HTTP Basic Authentication adds the required authentication labels to the proxy. Coolify currently supports a single username and password."+ :options="[+ ['value' => false, 'label' => 'None'],+ ['value' => true, 'label' => 'HTTP Basic Authentication'],+ ]" x-bind:disabled="!canUpdate" />+ @if ($isHttpBasicAuthEnabled)+ <div class="mt-5 grid w-full gap-4 border-t border-neutral-200 pt-5 sm:grid-cols-2 dark:border-white/[0.07]">+ <x-forms.input id="httpBasicAuthUsername" label="Username" required+ x-bind:disabled="!canUpdate" />+ <x-forms.input id="httpBasicAuthPassword" type="password" label="Password" required+ x-bind:disabled="!canUpdate" />+ </div>+ @php+ $server = $application->destination->server;+ $supportsArgon2id = $server->caddySupportsArgon2idBasicAuth();+ $usesArgon2id = $httpBasicAuthHashAlgorithm === HttpBasicAuthHashAlgorithm::ARGON2ID->value;+ @endphp+ <div class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 text-sm font-semibold text-black dark:text-fg">Password hashing</h3>+ <div class="grid w-full gap-4 {{ $usesArgon2id ? 'sm:grid-cols-3' : 'sm:grid-cols-2' }}">+ <x-forms.listbox id="httpBasicAuthHashAlgorithm" label="Algorithm" onChange="instantSave"+ helper="Algorithm that hashes the password for the proxy labels.<br><br>Traefik supports only bcrypt. Argon2id needs the Caddy proxy, version 2.11 or newer. With Argon2id, labels generated for Traefik use bcrypt."+ :options="[+ ['value' => HttpBasicAuthHashAlgorithm::BCRYPT->value, 'label' => 'bcrypt', 'description' => 'Works with every proxy'],+ ['value' => HttpBasicAuthHashAlgorithm::ARGON2ID->value, 'label' => 'Argon2id', 'disabled' => ! $supportsArgon2id, 'description' => match (true) {+ $supportsArgon2id => 'Memory-hard, more resistant to cracking',+ $server->proxyType() === ProxyTypes::CADDY->value => 'Needs Caddy 2.11 or newer on this server',+ default => 'Only supported by the Caddy proxy',+ }],+ ]" x-bind:disabled="!canUpdate" />+ @if ($usesArgon2id)+ <div wire:key="http-basic-auth-argon2id-memory-cost" class="min-w-0">+ <x-forms.listbox id="httpBasicAuthArgon2idMemoryCost" label="Memory" onChange="instantSave"+ helper="Memory that the proxy needs to check a password. More memory makes the hash harder to crack, but every login attempt that the proxy has not seen before uses this much memory on the server."+ :options="collect([8, 16, 32, 64, 128, 256])->map(fn (int $mebibytes) => ['value' => $mebibytes * 1024, 'label' => $mebibytes.' MiB'])->all()" x-bind:disabled="!canUpdate" />+ </div>+ <div wire:key="http-basic-auth-argon2id-time-cost" class="min-w-0">+ <x-forms.listbox id="httpBasicAuthArgon2idTimeCost" label="Iterations" onChange="instantSave"+ helper="Number of passes over the memory. More iterations make the hash harder to crack and a password check slower."+ :options="collect(range(1, 12))->map(fn (int $iterations) => ['value' => $iterations, 'label' => (string) $iterations])->all()" x-bind:disabled="!canUpdate" />+ </div>+ @else+ <div wire:key="http-basic-auth-bcrypt-cost" class="min-w-0">+ <x-forms.listbox id="httpBasicAuthBcryptCost" label="Cost factor" onChange="instantSave"+ helper="Each step doubles the work to check or crack the password. Traefik checks the password on every request, so a higher cost makes every request slower."+ :options="collect(range(4, 14))->map(fn (int $cost) => ['value' => $cost, 'label' => (string) $cost])->all()" x-bind:disabled="!canUpdate" />+ </div>+ @endif+ </div>+ </div>+ @endif+ @endif+ </section>+ @endif+@if ($buildPack !== 'dockercompose')<livewire:project.application.internal-access :application="$application":key="'application-internal-access-'.$application->id" />@endif</x-application.settings-section>- <x-application.settings-section id="build-pipeline-section" title="Build pipeline" helper="Commands, directories and options used while building the application.">+ <x-application.settings-section id="build-pipeline-section" title="Build & deploy" helper="How Coolify builds the application, where it pushes the image, and the commands it runs around each deployment.">@if (!$application->dockerfile && $application->build_pack !== 'dockerimage')<div class="application-build-pack-options mb-5 border-b border-neutral-200 pb-5 dark:border-white/[0.07]"><div class="grid gap-4 sm:grid-cols-2">@@ -329,57 +400,83 @@useMonacoEditor rows="6" x-bind:disabled="!canUpdate"> </x-forms.textarea></div>@endif- </x-application.settings-section>@if ($buildPack !== 'dockercompose')- <x-application.settings-section id="container-image-section" title="Container image" helper="Configure the Docker image used for this application and where the built image is pushed.">- @if ($application->destination->server->isSwarm())- @if ($application->build_pack !== 'dockerimage')- <div>Docker Swarm requires the image to be available in a registry. More info <a- class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"- target="_blank">here</a>.</div>- @endif- @endif- <div class="grid gap-4 lg:grid-cols-2">- @if ($application->build_pack === 'dockerimage')- @if ($application->destination->server->isSwarm())- <x-forms.input required id="dockerRegistryImageName" label="Image" placeholder="nginx"- x-bind:disabled="!canUpdate" />- <x-forms.input id="dockerRegistryImageTag" label="Tag" placeholder="alpine"- helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"- x-bind:disabled="!canUpdate" />- @else- <x-forms.input id="dockerRegistryImageName" label="Image" placeholder="nginx"- x-bind:disabled="!canUpdate" />- <x-forms.input id="dockerRegistryImageTag" label="Tag" placeholder="alpine"- helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"- x-bind:disabled="!canUpdate" />+ <section id="container-image-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 text-sm font-semibold text-black dark:text-fg">{{ $application->build_pack === 'dockerimage' ? 'Image' : 'Image registry' }}</h3>+ @if ($application->destination->server->isSwarm())+ @if ($application->build_pack !== 'dockerimage')+ <div>Docker Swarm requires the image to be available in a registry. More info <a+ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"+ target="_blank">here</a>.</div>@endif- @else- @if (- $application->destination->server->isSwarm() ||- $application->additional_servers->count() > 0 ||- $application->settings->is_build_server_enabled ||- ! $application->destination->server->canBuildApplications())- <x-forms.input id="dockerRegistryImageName" required label="Image"- placeholder="ghcr.io/your-org/your-app" x-bind:disabled="!canUpdate" />- <x-forms.input id="dockerRegistryImageTag"- helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."- placeholder="latest" label="Tag"- x-bind:disabled="!canUpdate" />+ @endif+ <div class="grid gap-4 lg:grid-cols-2">+ @if ($application->build_pack === 'dockerimage')+ @if ($application->destination->server->isSwarm())+ <x-forms.input required id="dockerRegistryImageName" label="Image" placeholder="nginx"+ x-bind:disabled="!canUpdate" />+ <x-forms.input id="dockerRegistryImageTag" label="Tag" placeholder="alpine"+ helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"+ x-bind:disabled="!canUpdate" />+ @else+ <x-forms.input id="dockerRegistryImageName" label="Image" placeholder="nginx"+ x-bind:disabled="!canUpdate" />+ <x-forms.input id="dockerRegistryImageTag" label="Tag" placeholder="alpine"+ helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"+ x-bind:disabled="!canUpdate" />+ @endif@else- <x-forms.input id="dockerRegistryImageName"- helper="Empty means it won't push the image to a docker registry. Pre-tag the image with your registry url if you want to push it to a private registry (default: Dockerhub). <br><br>Example: ghcr.io/myimage"- placeholder="ghcr.io/your-org/your-app"- label="Image" x-bind:disabled="!canUpdate" />- <x-forms.input id="dockerRegistryImageTag"- placeholder="latest"- helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."- label="Tag" x-bind:disabled="!canUpdate" />+ @if (+ $application->destination->server->isSwarm() ||+ $application->additional_servers->count() > 0 ||+ $application->settings->is_build_server_enabled ||+ ! $application->destination->server->canBuildApplications())+ <x-forms.input id="dockerRegistryImageName" required label="Image"+ placeholder="ghcr.io/your-org/your-app" x-bind:disabled="!canUpdate" />+ <x-forms.input id="dockerRegistryImageTag"+ helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."+ placeholder="latest" label="Tag"+ x-bind:disabled="!canUpdate" />+ @else+ <x-forms.input id="dockerRegistryImageName"+ helper="Empty means it won't push the image to a docker registry. Pre-tag the image with your registry url if you want to push it to a private registry (default: Dockerhub). <br><br>Example: ghcr.io/myimage"+ placeholder="ghcr.io/your-org/your-app"+ label="Image" x-bind:disabled="!canUpdate" />+ <x-forms.input id="dockerRegistryImageTag"+ placeholder="latest"+ helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."+ label="Tag" x-bind:disabled="!canUpdate" />+ @endif@endif+ </div>+ </section>+ @endif+ <section id="deployment-lifecycle-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 text-sm font-semibold text-black dark:text-fg">Deployment commands</h3>+ <div class="grid gap-4 sm:grid-cols-2">+ <div class="flex flex-col gap-4">+ <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"+ id="preDeploymentCommand" label="Pre-deployment"+ helper="An optional script or command to execute in the existing container before the deployment begins.<br>It is always executed with 'sh -c', so you do not need add it manually." />+ @if ($buildPack === 'dockercompose')+ <x-forms.input x-bind:disabled="shouldDisable()" id="preDeploymentCommandContainer"+ label="Container name"+ helper="The name of the container to execute within. You can leave it blank if your application only has one container." />@endif</div>- </x-application.settings-section>- @endif+ <div class="flex flex-col gap-4">+ <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"+ id="postDeploymentCommand" label="Post-deployment"+ helper="An optional script or command to execute in the newly built container after the deployment completes.<br>It is always executed with 'sh -c', so you do not need add it manually." />+ @if ($buildPack === 'dockercompose')+ <x-forms.input x-bind:disabled="shouldDisable()" id="postDeploymentCommandContainer"+ label="Container name"+ helper="The name of the container to execute within. You can leave it blank if your application only has one container." />+ @endif+ </div>+ </div>+ </section>+ </x-application.settings-section>@if ($buildPack !== 'dockercompose')@php@@ -390,7 +487,11 @@]);$portsExposesDomainHint = "You can also set a different internal port for each domain on the <a class='underline dark:text-white' href='{$applicationDomainsUrl}'>Domains</a> page.";@endphp- <x-application.settings-section id="networking-section" title="Networking" helper="Ports the container exposes, host port mappings and internal network aliases. You can also set an internal port per domain.">+ <x-modal-input title="Networking" class="hidden" :wireIgnore="false"+ wireOpen="networkingModalOpen" subtitle="Ports the container exposes, host port mappings and internal network aliases."+ @open-networking-modal.window="modalOpen = true">+ <x-slot:content></x-slot:content>+ <form wire:submit="submit" class="flex flex-col">@if ($this->detectedPortInfo)@if ($this->detectedPortInfo['isEmpty'])<div@@ -487,150 +588,60 @@wire:model="customNetworkAliases" x-bind:disabled="!canUpdate" />@endif</div>- </x-application.settings-section>+ <div class="mt-5 flex justify-end gap-2 border-t border-neutral-200 pt-4 dark:border-white/[0.07]">+ <x-forms.button type="button" @click="modalOpen = false">Close</x-forms.button>+ <x-forms.button type="submit" isHighlighted canGate="update" :canResource="$application">Save</x-forms.button>+ </div>+ </form>+ </x-modal-input>- <x-application.settings-section id="runtime-section" title="Runtime" helper="Options applied to the container when it starts.">+ <x-application.settings-section id="container-section" title="Container" helper="Options and labels applied to the container when it starts."><x-forms.inputhelper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k --hostname=myapp"id="customDockerRunOptions" label="Custom Docker options" x-bind:disabled="!canUpdate" />- </x-application.settings-section>-- <x-application.settings-section id="security-section" title="Security" helper="Protect this application with authentication at the proxy level.">- @if ($application->settings->is_container_label_readonly_enabled == false)- <x-empty size="sm" title="Authentication is managed through labels"- description="Authentication is managed via manual proxy labels. Switch label management back to Coolify to configure it here."- icon-name="admin">- <x-slot:contents>- <button type="button" class="button"- @click="window.scrollToSettingsSection?.('container-labels-section')">- Go to Container labels- </button>- </x-slot:contents>- </x-empty>- @else- <x-forms.listbox id="isHttpBasicAuthEnabled" label="Authentication" onChange="instantSave"- helper="HTTP Basic Authentication adds the required authentication labels to the proxy. Coolify currently supports a single username and password."- :options="[- ['value' => false, 'label' => 'None'],- ['value' => true, 'label' => 'HTTP Basic Authentication'],- ]" x-bind:disabled="!canUpdate" />- @if ($isHttpBasicAuthEnabled)- <div class="mt-5 grid w-full gap-4 border-t border-neutral-200 pt-5 sm:grid-cols-2 dark:border-white/[0.07]">- <x-forms.input id="httpBasicAuthUsername" label="Username" required- x-bind:disabled="!canUpdate" />- <x-forms.input id="httpBasicAuthPassword" type="password" label="Password" required- x-bind:disabled="!canUpdate" />- </div>- @php- $server = $application->destination->server;- $supportsArgon2id = $server->caddySupportsArgon2idBasicAuth();- $usesArgon2id = $httpBasicAuthHashAlgorithm === HttpBasicAuthHashAlgorithm::ARGON2ID->value;- @endphp- <div class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">- <h3 class="mb-3 text-sm font-semibold text-black dark:text-fg">Password hashing</h3>- <div class="grid w-full gap-4 {{ $usesArgon2id ? 'sm:grid-cols-3' : 'sm:grid-cols-2' }}">- <x-forms.listbox id="httpBasicAuthHashAlgorithm" label="Algorithm" onChange="instantSave"- helper="Algorithm that hashes the password for the proxy labels.<br><br>Traefik supports only bcrypt. Argon2id needs the Caddy proxy, version 2.11 or newer. With Argon2id, labels generated for Traefik use bcrypt."- :options="[- ['value' => HttpBasicAuthHashAlgorithm::BCRYPT->value, 'label' => 'bcrypt', 'description' => 'Works with every proxy'],- ['value' => HttpBasicAuthHashAlgorithm::ARGON2ID->value, 'label' => 'Argon2id', 'disabled' => ! $supportsArgon2id, 'description' => match (true) {- $supportsArgon2id => 'Memory-hard, more resistant to cracking',- $server->proxyType() === ProxyTypes::CADDY->value => 'Needs Caddy 2.11 or newer on this server',- default => 'Only supported by the Caddy proxy',- }],- ]" x-bind:disabled="!canUpdate" />- @if ($usesArgon2id)- <div wire:key="http-basic-auth-argon2id-memory-cost" class="min-w-0">- <x-forms.listbox id="httpBasicAuthArgon2idMemoryCost" label="Memory" onChange="instantSave"- helper="Memory that the proxy needs to check a password. More memory makes the hash harder to crack, but every login attempt that the proxy has not seen before uses this much memory on the server."- :options="collect([8, 16, 32, 64, 128, 256])->map(fn (int $mebibytes) => ['value' => $mebibytes * 1024, 'label' => $mebibytes.' MiB'])->all()" x-bind:disabled="!canUpdate" />- </div>- <div wire:key="http-basic-auth-argon2id-time-cost" class="min-w-0">- <x-forms.listbox id="httpBasicAuthArgon2idTimeCost" label="Iterations" onChange="instantSave"- helper="Number of passes over the memory. More iterations make the hash harder to crack and a password check slower."- :options="collect(range(1, 12))->map(fn (int $iterations) => ['value' => $iterations, 'label' => (string) $iterations])->all()" x-bind:disabled="!canUpdate" />- </div>- @else- <div wire:key="http-basic-auth-bcrypt-cost" class="min-w-0">- <x-forms.listbox id="httpBasicAuthBcryptCost" label="Cost factor" onChange="instantSave"- helper="Each step doubles the work to check or crack the password. Traefik checks the password on every request, so a higher cost makes every request slower."- :options="collect(range(4, 14))->map(fn (int $cost) => ['value' => $cost, 'label' => (string) $cost])->all()" x-bind:disabled="!canUpdate" />- </div>- @endif- </div>+ <section id="container-labels-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 text-sm font-semibold text-black dark:text-fg">Labels</h3>+ <div class="grid w-full gap-4 sm:grid-cols-2">+ <x-forms.listbox id="isContainerLabelReadonlyEnabled" label="Label management"+ onChange="instantSave"+ helper="When Coolify manages the labels, they are regenerated automatically and manual edits can be lost.<br><br>If you edit them yourself, be careful: a wrong label set can break the proxy configuration after a restart (you can always reset to the Coolify defaults)."+ :options="[+ ['value' => true, 'label' => 'Managed by Coolify (auto-generated)'],+ ['value' => false, 'label' => 'Managed manually (edit labels yourself)'],+ ]" x-bind:disabled="!canUpdate" />+ <x-forms.listbox id="isContainerLabelEscapeEnabled" label="Special characters"+ onChange="instantSave"+ helper="By default, $ (and other special characters) are escaped: writing $ saves it as $$.<br><br>Keep them unescaped if you want to use environment variables inside the labels."+ :options="[+ ['value' => true, 'label' => 'Escape special characters ($ becomes $$)'],+ ['value' => false, 'label' => 'Keep unescaped (allow env variables)'],+ ]" x-bind:disabled="!canUpdate" />+ </div>+ <div class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <div class="mb-1.5 flex items-center justify-between gap-3">+ <label class="flex w-fit items-center gap-1.5" style="margin-bottom: 0">Active labels</label>+ @can('update', $application)+ <x-modal-confirmation title="Confirm Labels Reset to Coolify Defaults?"+ buttonTitle="Reset to defaults" submitAction="resetDefaultLabels(true)"+ :actions="[+ 'All your custom proxy labels will be lost.',+ 'Proxy labels (traefik, caddy, etc) will be reset to the coolify defaults.',+ ]" confirmationText="{{ $application->fqdn . '/' }}"+ confirmationLabel="Please confirm the execution of the actions by entering the Application URL below"+ shortConfirmationLabel="Application URL" :confirmWithPassword="false"+ step2ButtonText="Permanently Reset Labels" />+ @endcan</div>- @endif- @endif- </x-application.settings-section>- @endif-- <x-application.settings-section id="deployment-lifecycle-section" title="Deployment lifecycle" helper="Optional commands executed right before and after each deployment.">- <div class="grid gap-4 sm:grid-cols-2">- <div class="flex flex-col gap-4">- <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"- id="preDeploymentCommand" label="Pre-deployment"- helper="An optional script or command to execute in the existing container before the deployment begins.<br>It is always executed with 'sh -c', so you do not need add it manually." />- @if ($buildPack === 'dockercompose')- <x-forms.input x-bind:disabled="shouldDisable()" id="preDeploymentCommandContainer"- label="Container name"- helper="The name of the container to execute within. You can leave it blank if your application only has one container." />- @endif- </div>- <div class="flex flex-col gap-4">- <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"- id="postDeploymentCommand" label="Post-deployment"- helper="An optional script or command to execute in the newly built container after the deployment completes.<br>It is always executed with 'sh -c', so you do not need add it manually." />- @if ($buildPack === 'dockercompose')- <x-forms.input x-bind:disabled="shouldDisable()" id="postDeploymentCommandContainer"- label="Container name"- helper="The name of the container to execute within. You can leave it blank if your application only has one container." />- @endif- </div>- </div>- </x-application.settings-section>-- @if ($buildPack !== 'dockercompose')- <x-application.settings-section id="container-labels-section" title="Container labels" helper="Inspect or override the labels used by the proxy and runtime.">- <div class="grid w-full gap-4 sm:grid-cols-2">- <x-forms.listbox id="isContainerLabelReadonlyEnabled" label="Label management"- onChange="instantSave"- helper="When Coolify manages the labels, they are regenerated automatically and manual edits can be lost.<br><br>If you edit them yourself, be careful: a wrong label set can break the proxy configuration after a restart (you can always reset to the Coolify defaults)."- :options="[- ['value' => true, 'label' => 'Managed by Coolify (auto-generated)'],- ['value' => false, 'label' => 'Managed manually (edit labels yourself)'],- ]" x-bind:disabled="!canUpdate" />- <x-forms.listbox id="isContainerLabelEscapeEnabled" label="Special characters"- onChange="instantSave"- helper="By default, $ (and other special characters) are escaped: writing $ saves it as $$.<br><br>Keep them unescaped if you want to use environment variables inside the labels."- :options="[- ['value' => true, 'label' => 'Escape special characters ($ becomes $$)'],- ['value' => false, 'label' => 'Keep unescaped (allow env variables)'],- ]" x-bind:disabled="!canUpdate" />- </div>- <div class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">- <div class="mb-1.5 flex items-center justify-between gap-3">- <label class="flex w-fit items-center gap-1.5" style="margin-bottom: 0">Active labels</label>- @can('update', $application)- <x-modal-confirmation title="Confirm Labels Reset to Coolify Defaults?"- buttonTitle="Reset to defaults" submitAction="resetDefaultLabels(true)"- :actions="[- 'All your custom proxy labels will be lost.',- 'Proxy labels (traefik, caddy, etc) will be reset to the coolify defaults.',- ]" confirmationText="{{ $application->fqdn . '/' }}"- confirmationLabel="Please confirm the execution of the actions by entering the Application URL below"- shortConfirmationLabel="Application URL" :confirmWithPassword="false"- step2ButtonText="Permanently Reset Labels" />- @endcan+ @if ($application->settings->is_container_label_readonly_enabled)+ <x-forms.textarea readonly disabled rows="15" id="customLabels"+ monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>+ @else+ <x-forms.textarea rows="15" id="customLabels"+ monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>+ @endif</div>- @if ($application->settings->is_container_label_readonly_enabled)- <x-forms.textarea readonly disabled rows="15" id="customLabels"- monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>- @else- <x-forms.textarea rows="15" id="customLabels"- monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>- @endif- </div>+ </section></x-application.settings-section>@endif</div>diff --git a/resources/views/livewire/project/application/internal-access.blade.php b/resources/views/livewire/project/application/internal-access.blade.phpindex 6997b766b8..8fe6f28dee 100644--- a/resources/views/livewire/project/application/internal-access.blade.php+++ b/resources/views/livewire/project/application/internal-access.blade.php@@ -34,7 +34,7 @@Internal hostnames are only reachable by resources connected to this Docker network.</p><button type="button" class="button shrink-0"- @click="window.scrollToSettingsSection?.('networking-section')">+ @click="$dispatch('open-networking-modal')">Edit networking</button></div>diff --git a/resources/views/livewire/project/application/partials/domain-row.blade.php b/resources/views/livewire/project/application/partials/domain-row.blade.phpindex b186992c8f..4060bfab4a 100644--- a/resources/views/livewire/project/application/partials/domain-row.blade.php+++ b/resources/views/livewire/project/application/partials/domain-row.blade.php@@ -150,7 +150,7 @@@endif@else<button type="button"- @click="openEditDomain(@js($index), @js($row['url']), @js($editingParts), @js($row['service']), @js($isNoindexed ? 'noindex' : 'index'), @js($rowDirection))"+ @click="openEditDomain(@js($index), @js($row['url']), @js($editingParts), @js($row['service']), @js($isNoindexed ? 'noindex' : 'index'), @js($rowDirection), @js($row['inherited_port'] ?? null))"class="icon-button shrink-0"title="Domain settings" aria-label="Settings for {{ $publicUrl }}"><x-reicon name="settings" class="size-3.5" />diff --git a/resources/views/livewire/project/database/clickhouse/general.blade.php b/resources/views/livewire/project/database/clickhouse/general.blade.phpindex e7fe47fe0f..3286237a27 100644--- a/resources/views/livewire/project/database/clickhouse/general.blade.php+++ b/resources/views/livewire/project/database/clickhouse/general.blade.php@@ -25,8 +25,8 @@</x-callout>@endif- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this ClickHouse database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and credentials of this ClickHouse database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -40,52 +40,32 @@helper="Use a published clickhouse/clickhouse-server image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Credentials"- description="Keep these values aligned with the credentials configured inside ClickHouse.">- @if (!$database->started_at)- <x-callout type="warning" title="Verify the initial credentials">- You can only change these credentials here before the first start. Later changes must be made inside- the database.- </x-callout>- @endif- <div class="{{ !$database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">- <x-forms.input label="{{ $database->started_at ? 'Initial username' : 'Username' }}"- id="clickhouseAdminUser" placeholder="If empty: clickhouse"- :readonly="(bool) $database->started_at" required canGate="update" :canResource="$database" />- @if ($isPasswordHiddenForMember)- <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="{{ $database->started_at ? 'Initial password' : 'Password' }}"- id="clickhouseAdminPassword" type="password" required- :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"- helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" />+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep these values aligned with the credentials configured inside ClickHouse." /></h3>+ @if (!$database->started_at)+ <x-callout type="warning" title="Verify the initial credentials">+ You can only change these credentials here before the first start. Later changes must be made inside+ the database.+ </x-callout>@endif- </div>- </x-application.settings-section>-- <x-application.settings-section title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"- :canResource="$database" />+ <div class="{{ !$database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">+ <x-forms.input label="{{ $database->started_at ? 'Initial username' : 'Username' }}"+ id="clickhouseAdminUser" placeholder="If empty: clickhouse"+ :readonly="(bool) $database->started_at" required canGate="update" :canResource="$database" />+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="{{ $database->started_at ? 'Initial password' : 'Password' }}"+ id="clickhouseAdminPassword" type="password" required+ :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"+ helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" />+ @endif</div>- <x-forms.input placeholder="3000:8123" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:8123."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.clickhouse.status-info :database="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -98,30 +78,48 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.clickhouse.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="8123" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:8123" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:8123."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="8123" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ :canResource="$database" />+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/database/dragonfly/general.blade.php b/resources/views/livewire/project/database/dragonfly/general.blade.phpindex 592396c0ae..fe8062dde4 100644--- a/resources/views/livewire/project/database/dragonfly/general.blade.php+++ b/resources/views/livewire/project/database/dragonfly/general.blade.php@@ -2,8 +2,8 @@<form wire:submit="submit" class="flex flex-col gap-6"><x-unsaved-bar action="submit" />- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this Dragonfly database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and credentials of this Dragonfly database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -16,54 +16,34 @@<x-forms.input label="Image" id="image" required canGate="update" :canResource="$database" /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Credentials"- description="Keep these values aligned with the credentials configured inside Dragonfly.">- @if ($database->started_at)- @if ($isPasswordHiddenForMember)- <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Password" id="dragonflyPassword" type="password" required readonly- helper="You can only change this in the database." canGate="update" :canResource="$database" />- @endif- @else- <x-callout type="warning" title="Verify the initial credentials">- You can only change this password here before the first start. Later changes must be made inside the- database.- </x-callout>- <div class="mt-4">+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep these values aligned with the credentials configured inside Dragonfly." /></h3>+ @if ($database->started_at)@if ($isPasswordHiddenForMember)<x-forms.input label="Password" disabled value="Hidden (only admins can view)" />@else- <x-forms.input label="Password" id="dragonflyPassword" type="password" required- canGate="update" :canResource="$database" />+ <x-forms.input label="Password" id="dragonflyPassword" type="password" required readonly+ helper="You can only change this in the database." canGate="update" :canResource="$database" />@endif- </div>- @endif- </x-application.settings-section>-- <x-application.settings-section title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"- :canResource="$database" />- </div>- <x-forms.input placeholder="3000:6379" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:6379."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.dragonfly.status-info :database="$database" />- </div>+ @else+ <x-callout type="warning" title="Verify the initial credentials">+ You can only change this password here before the first start. Later changes must be made inside the+ database.+ </x-callout>+ <div class="mt-4">+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Password" id="dragonflyPassword" type="password" required+ canGate="update" :canResource="$database" />+ @endif+ </div>+ @endif+ </section></x-application.settings-section>- <x-application.settings-section title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -76,30 +56,48 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.dragonfly.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="6379" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:6379" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:6379."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="6379" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ :canResource="$database" />+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/database/keydb/general.blade.php b/resources/views/livewire/project/database/keydb/general.blade.phpindex 6d894df04b..aac83401a6 100644--- a/resources/views/livewire/project/database/keydb/general.blade.php+++ b/resources/views/livewire/project/database/keydb/general.blade.php@@ -2,8 +2,8 @@<form wire:submit="submit" class="flex flex-col gap-6"><x-unsaved-bar action="submit" />- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this KeyDB database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and credentials of this KeyDB database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -17,54 +17,34 @@helper="Use a published eqalpha/keydb image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Credentials"- description="Keep this value aligned with the password configured inside KeyDB.">- @if ($database->started_at)- @if ($isPasswordHiddenForMember)- <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Password" id="keydbPassword" type="password" required readonly- helper="You can only change this in the database." canGate="update" :canResource="$database" />- @endif- @else- <x-callout type="warning" title="Verify the initial credentials">- You can only change this password here before the first start. Later changes must be made inside the- database.- </x-callout>- <div class="mt-4">+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep this value aligned with the password configured inside KeyDB." /></h3>+ @if ($database->started_at)@if ($isPasswordHiddenForMember)<x-forms.input label="Password" disabled value="Hidden (only admins can view)" />@else- <x-forms.input label="Password" id="keydbPassword" type="password" required- canGate="update" :canResource="$database" />+ <x-forms.input label="Password" id="keydbPassword" type="password" required readonly+ helper="You can only change this in the database." canGate="update" :canResource="$database" />@endif- </div>- @endif- </x-application.settings-section>-- <x-application.settings-section title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"- :canResource="$database" />- </div>- <x-forms.input placeholder="3000:6379" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:6379."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.keydb.status-info :database="$database" />- </div>+ @else+ <x-callout type="warning" title="Verify the initial credentials">+ You can only change this password here before the first start. Later changes must be made inside the+ database.+ </x-callout>+ <div class="mt-4">+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Password" id="keydbPassword" type="password" required+ canGate="update" :canResource="$database" />+ @endif+ </div>+ @endif+ </section></x-application.settings-section>- <x-application.settings-section title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -77,38 +57,55 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.keydb.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="6379" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:6379" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:6379."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="6379" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Configuration"- description="Override only the KeyDB directives you need. All other defaults remain active.">- <x-forms.textarea- helper="<a target='_blank' class='underline' href='https://raw.githubusercontent.com/Snapchat/KeyDB/unstable/keydb.conf'>View the default KeyDB configuration</a>"- label="Custom KeyDB configuration" rows="10" id="keydbConf" canGate="update"+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options, configuration, and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update":canResource="$database" />- </x-application.settings-section>-- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <section id="configuration-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Configuration <x-helper helper="Override only the KeyDB directives you need. All other defaults remain active." /></h3>+ <x-forms.textarea+ helper="<a target='_blank' class='underline' href='https://raw.githubusercontent.com/Snapchat/KeyDB/unstable/keydb.conf'>View the default KeyDB configuration</a>"+ label="Custom KeyDB configuration" rows="10" id="keydbConf" canGate="update"+ :canResource="$database" />+ </section>+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/database/mariadb/general.blade.php b/resources/views/livewire/project/database/mariadb/general.blade.phpindex f2df51f661..3669388609 100644--- a/resources/views/livewire/project/database/mariadb/general.blade.php+++ b/resources/views/livewire/project/database/mariadb/general.blade.php@@ -2,8 +2,8 @@<form wire:submit="submit" class="flex flex-col gap-6"><x-unsaved-bar action="submit" />- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this MariaDB database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and credentials of this MariaDB database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -17,59 +17,39 @@helper="Use a published MariaDB image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Credentials"- description="Keep these values aligned with the credentials configured inside MariaDB.">- @if ($database->started_at)- <x-callout type="warning" title="Keep credentials synchronized">- Changing values here does not update MariaDB. Update MariaDB first, then synchronize the values here- so backups and other automations continue working.- </x-callout>- @endif- <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">- @if ($isPasswordHiddenForMember)- <x-forms.input label="Root password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Root password" id="mariadbRootPassword" type="password"- :required="(bool) $database->started_at" canGate="update" :canResource="$database" />- @endif- <x-forms.input label="Normal user" id="mariadbUser" required canGate="update"- :canResource="$database" />- @if ($isPasswordHiddenForMember)- <x-forms.input label="Normal user password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Normal user password" id="mariadbPassword" type="password" required- canGate="update" :canResource="$database" />+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep these values aligned with the credentials configured inside MariaDB." /></h3>+ @if ($database->started_at)+ <x-callout type="warning" title="Keep credentials synchronized">+ Changing values here does not update MariaDB. Update MariaDB first, then synchronize the values here+ so backups and other automations continue working.+ </x-callout>@endif- <x-forms.input label="Initial database" id="mariadbDatabase"- placeholder="If empty, it will match the normal user."- :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"- helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" />- </div>- </x-application.settings-section>-- <x-application.settings-section title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Root password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Root password" id="mariadbRootPassword" type="password"+ :required="(bool) $database->started_at" canGate="update" :canResource="$database" />+ @endif+ <x-forms.input label="Normal user" id="mariadbUser" required canGate="update":canResource="$database" />+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Normal user password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Normal user password" id="mariadbPassword" type="password" required+ canGate="update" :canResource="$database" />+ @endif+ <x-forms.input label="Initial database" id="mariadbDatabase"+ placeholder="If empty, it will match the normal user."+ :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"+ helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" /></div>- <x-forms.input placeholder="3000:3306" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:3306."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.mariadb.status-info :database="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -82,36 +62,53 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.mariadb.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="3306" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:3306" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:3306."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="3306" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Configuration"- description="Override the MariaDB configuration used by this container.">- <x-forms.textarea label="Custom MariaDB configuration" rows="10" id="mariadbConf"- canGate="update" :canResource="$database" />- </x-application.settings-section>-- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options, configuration, and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ :canResource="$database" />+ <section id="configuration-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Configuration <x-helper helper="Override the MariaDB configuration used by this container." /></h3>+ <x-forms.textarea label="Custom MariaDB configuration" rows="10" id="mariadbConf"+ canGate="update" :canResource="$database" />+ </section>+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/database/mongodb/general.blade.php b/resources/views/livewire/project/database/mongodb/general.blade.phpindex ac47d8d69f..0db195fd32 100644--- a/resources/views/livewire/project/database/mongodb/general.blade.php+++ b/resources/views/livewire/project/database/mongodb/general.blade.php@@ -2,8 +2,8 @@<form wire:submit="submit" class="flex flex-col gap-6"><x-unsaved-bar action="submit" />- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this MongoDB database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and credentials of this MongoDB database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -17,56 +17,36 @@helper="Use a published MongoDB image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Credentials"- description="Keep these values aligned with the credentials configured inside MongoDB.">- @if ($database->started_at)- <x-callout type="warning" title="Keep credentials synchronized">- Changing values here does not update MongoDB. Update MongoDB first, then synchronize the values here- so backups and other automations continue working.- </x-callout>- @endif- <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">- <x-forms.input label="{{ $database->started_at ? 'Initial username' : 'Username' }}"- id="mongoInitdbRootUsername" placeholder="If empty: root"- :required="!$database->started_at" canGate="update" :canResource="$database" />- @if ($isPasswordHiddenForMember)- <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="{{ $database->started_at ? 'Initial password' : 'Password' }}"- id="mongoInitdbRootPassword" type="password" required canGate="update"- :canResource="$database" />+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep these values aligned with the credentials configured inside MongoDB." /></h3>+ @if ($database->started_at)+ <x-callout type="warning" title="Keep credentials synchronized">+ Changing values here does not update MongoDB. Update MongoDB first, then synchronize the values here+ so backups and other automations continue working.+ </x-callout>@endif- <x-forms.input label="{{ $database->started_at ? 'Initial database' : 'Database' }}"- id="mongoInitdbDatabase" placeholder="If empty, it will match the username."- :readonly="(bool) $database->started_at" :required="!$database->started_at"- canGate="update" :canResource="$database"- helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" />- </div>- </x-application.settings-section>-- <x-application.settings-section title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"- :canResource="$database" />+ <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">+ <x-forms.input label="{{ $database->started_at ? 'Initial username' : 'Username' }}"+ id="mongoInitdbRootUsername" placeholder="If empty: root"+ :required="!$database->started_at" canGate="update" :canResource="$database" />+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="{{ $database->started_at ? 'Initial password' : 'Password' }}"+ id="mongoInitdbRootPassword" type="password" required canGate="update"+ :canResource="$database" />+ @endif+ <x-forms.input label="{{ $database->started_at ? 'Initial database' : 'Database' }}"+ id="mongoInitdbDatabase" placeholder="If empty, it will match the username."+ :readonly="(bool) $database->started_at" :required="!$database->started_at"+ canGate="update" :canResource="$database"+ helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" /></div>- <x-forms.input placeholder="3000:27017" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:27017."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.mongodb.status-info :database="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -79,36 +59,53 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.mongodb.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="27017" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:27017" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:27017."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="27017" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>- </x-application.settings-section>-- <x-application.settings-section title="Configuration"- description="Override the MongoDB configuration used by this container.">- <x-forms.textarea label="Custom MongoDB configuration" rows="10" id="mongoConf"- canGate="update" :canResource="$database" />+ </section></x-application.settings-section>- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options, configuration, and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ :canResource="$database" />+ <section id="configuration-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Configuration <x-helper helper="Override the MongoDB configuration used by this container." /></h3>+ <x-forms.textarea label="Custom MongoDB configuration" rows="10" id="mongoConf"+ canGate="update" :canResource="$database" />+ </section>+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/database/mysql/general.blade.php b/resources/views/livewire/project/database/mysql/general.blade.phpindex 7f7b40085d..237a7ec263 100644--- a/resources/views/livewire/project/database/mysql/general.blade.php+++ b/resources/views/livewire/project/database/mysql/general.blade.php@@ -2,8 +2,8 @@<form wire:submit="submit" class="flex flex-col gap-6"><x-unsaved-bar action="submit" />- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this MySQL database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and credentials of this MySQL database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -17,59 +17,39 @@helper="Use a published MySQL image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Credentials"- description="Keep these values aligned with the credentials configured inside MySQL.">- @if ($database->started_at)- <x-callout type="warning" title="Keep credentials synchronized">- Changing values here does not update MySQL. Update MySQL first, then synchronize the values here so- backups and other automations continue working.- </x-callout>- @endif- <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">- @if ($isPasswordHiddenForMember)- <x-forms.input label="Root password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Root password" id="mysqlRootPassword" type="password"- :required="(bool) $database->started_at" canGate="update" :canResource="$database" />- @endif- <x-forms.input label="Normal user" id="mysqlUser" required canGate="update"- :canResource="$database" />- @if ($isPasswordHiddenForMember)- <x-forms.input label="Normal user password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Normal user password" id="mysqlPassword" type="password" required- canGate="update" :canResource="$database" />+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep these values aligned with the credentials configured inside MySQL." /></h3>+ @if ($database->started_at)+ <x-callout type="warning" title="Keep credentials synchronized">+ Changing values here does not update MySQL. Update MySQL first, then synchronize the values here so+ backups and other automations continue working.+ </x-callout>@endif- <x-forms.input label="Initial database" id="mysqlDatabase"- placeholder="If empty, it will match the normal user."- :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"- helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" />- </div>- </x-application.settings-section>-- <x-application.settings-section title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Root password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Root password" id="mysqlRootPassword" type="password"+ :required="(bool) $database->started_at" canGate="update" :canResource="$database" />+ @endif+ <x-forms.input label="Normal user" id="mysqlUser" required canGate="update":canResource="$database" />+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Normal user password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Normal user password" id="mysqlPassword" type="password" required+ canGate="update" :canResource="$database" />+ @endif+ <x-forms.input label="Initial database" id="mysqlDatabase"+ placeholder="If empty, it will match the normal user."+ :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"+ helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" /></div>- <x-forms.input placeholder="3000:3306" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:3306."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.mysql.status-info :database="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -82,36 +62,53 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.mysql.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="3306" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:3306" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:3306."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="3306" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Configuration"- description="Override the MySQL configuration used by this container.">- <x-forms.textarea label="Custom MySQL configuration" rows="10" id="mysqlConf"- canGate="update" :canResource="$database" />- </x-application.settings-section>-- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options, configuration, and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ :canResource="$database" />+ <section id="configuration-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Configuration <x-helper helper="Override the MySQL configuration used by this container." /></h3>+ <x-forms.textarea label="Custom MySQL configuration" rows="10" id="mysqlConf"+ canGate="update" :canResource="$database" />+ </section>+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.phpindex 130669b01d..5774892960 100644--- a/resources/views/livewire/project/database/postgresql/general.blade.php+++ b/resources/views/livewire/project/database/postgresql/general.blade.php@@ -3,7 +3,7 @@<x-unsaved-bar action="submit" /><x-application.settings-section id="database-details-section" title="Database details"- description="Manage the identity and container image for this PostgreSQL database.">+ description="Manage the identity, container image, and credentials of this PostgreSQL database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -17,63 +17,42 @@helper="Use a published PostgreSQL image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section id="credentials-section" title="Credentials"- description="Keep these values aligned with the credentials configured inside PostgreSQL.">- @if ($database->started_at)- <x-callout type="warning" title="Keep credentials synchronized">- Changing values here does not update PostgreSQL. Update PostgreSQL first, then synchronize the- values here so backups and other automations continue working.- </x-callout>- @endif- <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">- <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres"- canGate="update" :canResource="$database" />- @if ($isPasswordHiddenForMember)- <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Password" id="postgresPassword" type="password" required- canGate="update" :canResource="$database" />+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep these values aligned with the credentials configured inside PostgreSQL." /></h3>+ @if ($database->started_at)+ <x-callout type="warning" title="Keep credentials synchronized">+ Changing values here does not update PostgreSQL. Update PostgreSQL first, then synchronize the+ values here so backups and other automations continue working.+ </x-callout>@endif- <x-forms.input label="Initial database" id="postgresDb"- placeholder="If empty, it will match the username."- :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"- helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" />- </div>- </x-application.settings-section>-- <x-application.settings-section id="initialization-section" title="Initialization"- description="Configure the options used when PostgreSQL creates its initial data directory.">- <div class="grid gap-4 lg:grid-cols-2">- <x-forms.input label="Initial database arguments" id="postgresInitdbArgs"- placeholder="Leave empty to use the image default." canGate="update" :canResource="$database" />- <x-forms.input label="Host authentication method" id="postgresHostAuthMethod"- placeholder="Leave empty to use the image default." canGate="update" :canResource="$database" />- </div>- </x-application.settings-section>-- <x-application.settings-section id="runtime-network-section" title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"- :canResource="$database" />+ <div class="{{ $database->started_at ? 'mt-4 ' : '' }}grid gap-4 lg:grid-cols-2">+ <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres"+ canGate="update" :canResource="$database" />+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Password" id="postgresPassword" type="password" required+ canGate="update" :canResource="$database" />+ @endif+ <x-forms.input label="Initial database" id="postgresDb"+ placeholder="If empty, it will match the username."+ :readonly="(bool) $database->started_at" canGate="update" :canResource="$database"+ helper="{{ $database->started_at ? 'You can only change this in the database.' : null }}" /></div>- <x-forms.input placeholder="3000:5432" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:5432."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.postgresql.status-info :database="$database" />- </div>+ </section>+ <section id="initialization-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Initialization <x-helper helper="Configure the options used when PostgreSQL creates its initial data directory." /></h3>+ <div class="grid gap-4 lg:grid-cols-2">+ <x-forms.input label="Initial database arguments" id="postgresInitdbArgs"+ placeholder="Leave empty to use the image default." canGate="update" :canResource="$database" />+ <x-forms.input label="Host authentication method" id="postgresHostAuthMethod"+ placeholder="Leave empty to use the image default." canGate="update" :canResource="$database" />+ </div>+ </section></x-application.settings-section>- <x-application.settings-section id="public-access-section" title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -86,36 +65,53 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave" :onChangeArgs="[]"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.postgresql.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave" :onChangeArgs="[]"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="5432" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:5432" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:5432."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="5432" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section id="configuration-section" title="Configuration"- description="Override the PostgreSQL configuration used by this container.">- <x-forms.textarea label="Custom PostgreSQL configuration" rows="10" id="postgresConf"- canGate="update" :canResource="$database" />- </x-application.settings-section>-- <x-application.settings-section id="log-delivery-section" title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options, configuration, and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update"+ :canResource="$database" />+ <section id="configuration-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Configuration <x-helper helper="Override the PostgreSQL configuration used by this container." /></h3>+ <x-forms.textarea label="Custom PostgreSQL configuration" rows="10" id="postgresConf"+ canGate="update" :canResource="$database" />+ </section>+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form>diff --git a/resources/views/livewire/project/database/redis/general.blade.php b/resources/views/livewire/project/database/redis/general.blade.phpindex 3fdf256190..6f3dbface9 100644--- a/resources/views/livewire/project/database/redis/general.blade.php+++ b/resources/views/livewire/project/database/redis/general.blade.php@@ -2,8 +2,8 @@<form wire:submit="submit" class="flex flex-col gap-6"><x-unsaved-bar action="submit" />- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this Redis database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and credentials of this Redis database."><x-slot:actions><x-modal-input title="Resource details" buttonTitle="Details"><livewire:project.shared.resource-details :resource="$database" />@@ -17,58 +17,38 @@helper="Use a published Redis image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Credentials"- description="Keep these values aligned with the credentials configured inside Redis.">- <x-callout type="warning" title="{{ $database->started_at ? 'Keep credentials synchronized' : 'Verify the initial credentials' }}">- @if ($database->started_at)- Changing values here does not update Redis. Update Redis first, then synchronize the values here so- automations continue working.- @else- These values can only be changed here before the first start.- @endif- </x-callout>- <div class="mt-4 grid gap-4 lg:grid-cols-2">- @if (version_compare($redisVersion, '6.0', '>='))- <x-forms.input label="Username" id="redisUsername" :required="!$database->started_at"- helper="{{ $database->started_at ? 'You can only change this in the database.' : 'Shared REDIS_USERNAME values make this field read-only.' }}"- :disabled="!$database->started_at && $this->isSharedVariable('REDIS_USERNAME')"- canGate="update" :canResource="$database" />- @endif- @if ($isPasswordHiddenForMember)- <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />- @else- <x-forms.input label="Password" id="redisPassword" type="password"- :required="!$database->started_at"- helper="{{ $database->started_at ? 'You can only change this in the database.' : 'Shared REDIS_PASSWORD values make this field read-only.' }}"- :disabled="!$database->started_at && $this->isSharedVariable('REDIS_PASSWORD')"- canGate="update" :canResource="$database" />- @endif- </div>- </x-application.settings-section>-- <x-application.settings-section title="Runtime and network"- description="Configure Docker runtime options and host port mappings.">- <div class="grid gap-4 lg:grid-cols-2">- <div class="lg:col-span-2">- <x-forms.input- helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."- placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"- id="customDockerRunOptions" label="Custom Docker options" canGate="update"- :canResource="$database" />+ <section id="credentials-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Credentials <x-helper helper="Keep these values aligned with the credentials configured inside Redis." /></h3>+ <x-callout type="warning" title="{{ $database->started_at ? 'Keep credentials synchronized' : 'Verify the initial credentials' }}">+ @if ($database->started_at)+ Changing values here does not update Redis. Update Redis first, then synchronize the values here so+ automations continue working.+ @else+ These values can only be changed here before the first start.+ @endif+ </x-callout>+ <div class="mt-4 grid gap-4 lg:grid-cols-2">+ @if (version_compare($redisVersion, '6.0', '>='))+ <x-forms.input label="Username" id="redisUsername" :required="!$database->started_at"+ helper="{{ $database->started_at ? 'You can only change this in the database.' : 'Shared REDIS_USERNAME values make this field read-only.' }}"+ :disabled="!$database->started_at && $this->isSharedVariable('REDIS_USERNAME')"+ canGate="update" :canResource="$database" />+ @endif+ @if ($isPasswordHiddenForMember)+ <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />+ @else+ <x-forms.input label="Password" id="redisPassword" type="password"+ :required="!$database->started_at"+ helper="{{ $database->started_at ? 'You can only change this in the database.' : 'Shared REDIS_PASSWORD values make this field read-only.' }}"+ :disabled="!$database->started_at && $this->isSharedVariable('REDIS_PASSWORD')"+ canGate="update" :canResource="$database" />+ @endif</div>- <x-forms.input placeholder="3000:6379" id="portsMappings" label="Port mappings"- helper="Comma-separated host-to-container mappings, for example 3000:6379."- canGate="update" :canResource="$database" />- </div>- <div class="mt-4">- <livewire:project.database.redis.status-info :database="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Public access" class="relative"- description="Expose this database through the managed TCP proxy.">+ <x-application.settings-section id="access-section" title="Access"+ description="How applications and clients connect to this database, and whether it is reachable from the internet."><x-slot:actions>@if ($isPublic)<x-process-dialog closeWithX size="xl">@@ -81,40 +61,57 @@</x-process-dialog>@endif</x-slot:actions>- <x-table.loading target="instantSave" text="Updating public access..." />- <div class="grid gap-4 lg:grid-cols-2">- <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">- <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[- ['value' => false, 'label' => 'Private'],- ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],- ]" />+ <section id="connection-section">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Connection <x-helper helper="Use these URLs to connect to the database." /></h3>+ <livewire:project.database.redis.status-info :database="$database" />+ </section>+ <section id="public-access-section" class="relative mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Public access <x-helper helper="Expose this database through the managed TCP proxy." /></h3>+ <x-table.loading target="instantSave" text="Updating public access..." />+ <div class="grid gap-4 lg:grid-cols-2">+ <div wire:key="public-access-{{ $publicPort ?: 'unset' }}">+ <x-forms.listbox id="isPublic" label="Access" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $database)" canGate="update" :canResource="$database" :options="[+ ['value' => false, 'label' => 'Private'],+ ['value' => true, 'label' => blank($publicPort) ? 'Public through TCP proxy (set public port first)' : 'Public through TCP proxy', 'disabled' => blank($publicPort)],+ ]" />+ </div>+ <x-forms.input type="number" placeholder="6379" disabled="{{ $isPublic }}" id="publicPort"+ label="Public port" canGate="update" :canResource="$database" />+ <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"+ label="Proxy timeout" helper="Timeout in seconds. The default is 3600."+ canGate="update" :canResource="$database" />+ <x-forms.input placeholder="3000:6379" id="portsMappings" label="Port mappings"+ helper="Comma-separated host-to-container mappings, for example 3000:6379."+ canGate="update" :canResource="$database" /></div>- <x-forms.input type="number" placeholder="6379" disabled="{{ $isPublic }}" id="publicPort"- label="Public port" canGate="update" :canResource="$database" />- <x-forms.input type="number" placeholder="3600" disabled="{{ $isPublic }}" id="publicPortTimeout"- label="Proxy timeout" helper="Timeout in seconds. The default is 3600."- canGate="update" :canResource="$database" />- </div>+ </section></x-application.settings-section>- <x-application.settings-section title="Configuration"- description="Override only the Redis directives you need. All other defaults remain active.">- <x-forms.textarea placeholder="# maxmemory 256mb-# maxmemory-policy allkeys-lru-# timeout 300"- helper="Coolify automatically applies requirepass using the password above. If you override requirepass here, keep both values identical."- label="Custom Redis configuration" rows="10" id="redisConf" canGate="update"+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options, configuration, and log forwarding for the database container.">+ <x-forms.input+ helper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."+ placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"+ id="customDockerRunOptions" label="Custom Docker options" canGate="update":canResource="$database" />- </x-application.settings-section>-- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <section id="configuration-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Configuration <x-helper helper="Override only the Redis directives you need. All other defaults remain active." /></h3>+ <x-forms.textarea placeholder="# maxmemory 256mb+ # maxmemory-policy allkeys-lru+ # timeout 300"+ helper="Coolify automatically applies requirepass using the password above. If you override requirepass here, keep both values identical."+ label="Custom Redis configuration" rows="10" id="redisConf" canGate="update"+ :canResource="$database" />+ </section>+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/database/sqlite/general.blade.php b/resources/views/livewire/project/database/sqlite/general.blade.phpindex bf22507420..7fb8d6f9a9 100644--- a/resources/views/livewire/project/database/sqlite/general.blade.php+++ b/resources/views/livewire/project/database/sqlite/general.blade.php@@ -2,8 +2,8 @@<form wire:submit="submit" class="flex flex-col gap-6"><x-unsaved-bar action="submit" />- <x-application.settings-section title="Database details"- description="Manage the identity and container image for this SQLite database.">+ <x-application.settings-section id="database-details-section" title="Database details"+ description="Manage the identity, container image, and database files of this SQLite database."><x-slot:actions><x-status-badge status="Experimental" type="warning" /><x-modal-input title="Resource details" buttonTitle="Details">@@ -18,34 +18,33 @@helper="Use a published peakimages/sqlite image from Docker Hub." /></div></div>- </x-application.settings-section>-- <x-application.settings-section title="Database files"- description="Applications use these databases by mounting the data volume.">- <div class="grid gap-4 lg:grid-cols-2">- <x-forms.input label="File names" id="sqliteDatabases" placeholder="database.sqlite" required- canGate="update" :canResource="$database"- helper="Comma-separated file names. Missing files are created in the data volume on the next start. Removing a name does not delete its file. Backups restore into the first file." />- </div>+ <section id="database-files-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Database files <x-helper helper="Applications use these databases by mounting the data volume." /></h3>+ <div class="grid gap-4 lg:grid-cols-2">+ <x-forms.input label="File names" id="sqliteDatabases" placeholder="database.sqlite" required+ canGate="update" :canResource="$database"+ helper="Comma-separated file names. Missing files are created in the data volume on the next start. Removing a name does not delete its file. Backups restore into the first file." />+ </div>+ </section></x-application.settings-section><livewire:project.database.sqlite.connect-application :database="$database" />- <x-application.settings-section title="Runtime" description="Configure Docker runtime options.">+ <x-application.settings-section id="container-section" title="Container"+ description="Docker options and log forwarding for the database container."><x-forms.inputhelper="Add supported docker run options used when the container starts. Unsupported options can interfere with Coolify automation."placeholder="--cap-add SYS_ADMIN --device=/dev/fuse"id="customDockerRunOptions" label="Custom Docker options" canGate="update":canResource="$database" />- </x-application.settings-section>-- <x-application.settings-section title="Log delivery"- description="Forward container logs to the drain configured on the server.">- <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"- :disabled="! auth()->user()->can('update', $database)" :options="[- ['value' => false, 'label' => 'Do not forward logs'],- ['value' => true, 'label' => 'Forward logs to the server drain'],- ]" />+ <section id="log-delivery-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Log delivery <x-helper helper="Forward container logs to the drain configured on the server." /></h3>+ <x-forms.listbox canGate="update" :canResource="$database" id="isLogDrainEnabled" label="Log drain" live onChange="instantSaveAdvanced"+ :disabled="! auth()->user()->can('update', $database)" :options="[+ ['value' => false, 'label' => 'Do not forward logs'],+ ['value' => true, 'label' => 'Forward logs to the server drain'],+ ]" />+ </section></x-application.settings-section></form></div>diff --git a/resources/views/livewire/project/service/stack-form.blade.php b/resources/views/livewire/project/service/stack-form.blade.phpindex cb8721bd46..fae8fb6bfc 100644--- a/resources/views/livewire/project/service/stack-form.blade.php+++ b/resources/views/livewire/project/service/stack-form.blade.php@@ -2,7 +2,7 @@<x-unsaved-bar action="submit" /><x-application.settings-section title="Service details"- description="Manage the identity and Compose configuration for this service.">+ description="Manage the identity, Compose configuration, and network of this service."><x-slot:actions><div class="flex items-center gap-2">@if (isDev())@@ -49,15 +49,14 @@placeholder="My WordPress site" /><x-forms.input canGate="update" :canResource="$service" id="description" label="Description" /></div>- </x-application.settings-section>-- <x-application.settings-section title="Network"- description="Control whether this Compose stack joins Coolify's predefined network.">- <x-forms.listbox canGate="update" :canResource="$service" id="connectToDockerNetwork" label="Network attachment" live onChange="instantSave"- :disabled="! auth()->user()->can('update', $service)" :options="[- ['value' => false, 'label' => 'Use the stack network only'],- ['value' => true, 'label' => 'Connect to the predefined Coolify network'],- ]" />+ <section id="service-network-section" class="mt-5 border-t border-neutral-200 pt-5 dark:border-white/[0.07]">+ <h3 class="mb-3 flex items-center gap-1.5 text-sm font-semibold text-black dark:text-fg">Network <x-helper helper="Control whether this Compose stack joins Coolify's predefined network." /></h3>+ <x-forms.listbox canGate="update" :canResource="$service" id="connectToDockerNetwork" label="Network attachment" live onChange="instantSave"+ :disabled="! auth()->user()->can('update', $service)" :options="[+ ['value' => false, 'label' => 'Use the stack network only'],+ ['value' => true, 'label' => 'Connect to the predefined Coolify network'],+ ]" />+ </section></x-application.settings-section>@if ($fields->count() > 0)diff --git a/resources/views/livewire/project/service/volume-backup/index.blade.php b/resources/views/livewire/project/service/volume-backup/index.blade.phpindex e3605b7a7f..06145e4b3c 100644--- a/resources/views/livewire/project/service/volume-backup/index.blade.php+++ b/resources/views/livewire/project/service/volume-backup/index.blade.php@@ -227,10 +227,9 @@</div></div>- <div @class([- 'application-settings-section-body relative w-full',- 'is-flush' => $backups->isNotEmpty() || $databaseBackups->isNotEmpty(),- ])>+ <x-application.settings-section title="Schedules"+ helper="Database, persistent volume, and directory backup schedules for this service."+ :flush="$backups->isNotEmpty() || $databaseBackups->isNotEmpty()"><x-table.loading target="openSchedule" text="Loading schedule..." /><div x-cloak x-show="backups.length > 0 && filteredBackups.length === 0">@@ -365,7 +364,7 @@description="Add a database, persistent volume, or directory backup schedule to protect service data."icon-name="storages" />@endif- </div>+ </x-application.settings-section><livewire:project.service.backup-executions :service="$service"wire:key="service-backup-executions-{{ $service->id }}" /></div>diff --git a/resources/views/livewire/project/shared/resource-operations.blade.php b/resources/views/livewire/project/shared/resource-operations.blade.phpindex 7efa9b79bd..e1670db563 100644--- a/resources/views/livewire/project/shared/resource-operations.blade.php+++ b/resources/views/livewire/project/shared/resource-operations.blade.php@@ -139,10 +139,10 @@}));}}" x-init="- selectedCloneServer = null;- selectedCloneDestination = null;- selectedCloneProject = null;- selectedCloneEnvironment = null;+ selectedCloneServer = currentServerId;+ selectedCloneDestination = currentDestinationUuid;+ selectedCloneProject = currentProjectId;+ selectedCloneEnvironment = currentEnvironmentId;selectedMigrateServer = null;selectedMigrateDestination = null;$watch('selectedCloneServer', () => selectedCloneDestination = null);@@ -151,8 +151,8 @@$watch('selectedMoveProject', () => selectedMoveEnvironment = null);" class="flex flex-col gap-6">@can('update', $resource)- <x-application.settings-section id="clone-destination-section" title="Clone to another destination"- helper="Create the clone in the current environment on another server or network.">+ <x-application.settings-section id="clone-resource-section" title="Clone resource"+ helper="Create a copy of this resource. Choose where it runs and where it belongs. The current values are selected by default."><x-callout type="info" title="Configuration only">Cloning copies settings, environment variables, and resource configuration. Stored files,database records, and other persistent data are not copied.@@ -168,14 +168,24 @@x-bind:disabled="selectedCloneServer === null || selectedCloneServer === ''"placeholder="Choose a destination…"emptyText="No network destinations are available on this server." />++ <x-forms.listbox id="clone-resource-project" label="Project" :wire="false"+ x-model="selectedCloneProject" x-effect="options = cloneProjectOptions"+ placeholder="Choose a project…" />++ <x-forms.listbox id="clone-resource-environment" label="Environment" :wire="false"+ x-model="selectedCloneEnvironment" x-effect="options = cloneEnvironmentOptions"+ x-bind:disabled="!selectedCloneProject || availableCloneEnvironments.length === 0"+ placeholder="Choose an environment…" /></div>- <div x-show="selectedCloneDestination" x-cloak+ <divclass="mt-4 flex flex-col gap-3 border-t border-neutral-200 pt-4 sm:flex-row sm:items-center sm:justify-between dark:border-white/[0.07]"><p class="text-[13px] text-neutral-500 dark:text-fg-dim">The running resource will not be changed.</p>- <x-forms.button @click="$wire.cloneTo(selectedCloneDestination)">+ <x-forms.button x-bind:disabled="!selectedCloneDestination || !selectedCloneEnvironment"+ @click="$wire.cloneTo(selectedCloneDestination, selectedCloneEnvironment)">Clone resource</x-forms.button></div>@@ -232,32 +242,6 @@</x-application.settings-section>@endif- <x-application.settings-section id="clone-environment-section" title="Clone to another environment"- helper="Create the clone in another project environment while keeping the current server and network.">- <div class="grid gap-4 md:grid-cols-2">- <x-forms.listbox id="clone-resource-project" label="Project" :wire="false"- x-model="selectedCloneProject" x-effect="options = cloneProjectOptions"- placeholder="Choose a project…" />-- <x-forms.listbox id="clone-resource-environment" label="Environment" :wire="false"- x-model="selectedCloneEnvironment" x-effect="options = cloneEnvironmentOptions"- x-bind:disabled="!selectedCloneProject || availableCloneEnvironments.length === 0"- placeholder="Choose an environment…" />- </div>-- <div x-show="selectedCloneEnvironment" x-cloak- class="mt-4 flex flex-col gap-3 border-t border-neutral-200 pt-4 sm:flex-row sm:items-center sm:justify-between dark:border-white/[0.07]">- <p class="text-[13px] text-neutral-500 dark:text-fg-dim">- Uses {{ data_get($resource, 'destination.server.name') }} ·- {{ data_get($resource, 'destination.network') }}.- </p>- <x-forms.button- @click="$wire.cloneTo(currentDestinationUuid, selectedCloneEnvironment)">- Clone resource- </x-forms.button>- </div>- </x-application.settings-section>-<x-application.settings-section id="move-resource-section" title="Move resource"helper="Transfer this resource to another project environment without changing the running deployment.">@if ($projects->count() > 0)diff --git a/tests/Feature/ApplicationDomainsTest.php b/tests/Feature/ApplicationDomainsTest.phpindex c0b7a599f3..65b3c38740 100644--- a/tests/Feature/ApplicationDomainsTest.php+++ b/tests/Feature/ApplicationDomainsTest.php@@ -2820,6 +2820,21 @@ it('does not prefill the default internal port when editing a domain without a p->assertSet('editingDomainParts.port', '');});+it('passes the inherited internal port to the domain settings modal', function () {+ $this->application->update([+ 'ports_exposes' => '3000,8080',+ 'fqdn' => 'https://example.com:8080',+ ]);++ Livewire::test(Domains::class, ['application' => $this->application->fresh()])+ ->assertSet('domainRows.0.internal_port', 8080)+ ->assertSet('domainRows.0.inherited_port', 3000)+ ->call('startEdit', 0)+ ->assertSet('editingInheritedPort', 3000)+ ->call('cancelEdit')+ ->assertSet('editingInheritedPort', null);+});+it('clears a domain port override and shows the default internal port', function () {$this->application->update(['ports_exposes' => '3000,8080',diff --git a/tests/v4/Browser/ApplicationConfigurationTest.php b/tests/v4/Browser/ApplicationConfigurationTest.phpindex be745506ab..451051ca7e 100644--- a/tests/v4/Browser/ApplicationConfigurationTest.php+++ b/tests/v4/Browser/ApplicationConfigurationTest.php@@ -38,7 +38,7 @@ it('shows application configuration sections and navigation', function () {->assertSee('Application details')->assertSee('Internal access')->assertSee('Docker network')- ->assertSee('Build pipeline')+ ->assertSee('Build & deploy')->screenshot(filename: 'application-configuration-overview');});@@ -111,23 +111,33 @@ it('saves application name description and ports from the general form', functio$page->assertSee('General')->fill('name', $updatedName)->fill('description', 'Updated via browser test')+ ->click('#internal-access-section button:has-text("Edit networking")')->fill('portsExposes', '8080')+ ->fill('customNetworkAliases', 'api.internal')->screenshot(filename: 'application-general-before-save');- submitLivewireForm($page);-- $page->assertValue('name', $updatedName)+ $page->click('form button[type="submit"]:visible:has-text("Save")')+ ->assertScript(<<<'JS'+ () => [...document.querySelectorAll('#internal-access-section label')]+ .find((label) => label.textContent.trim() === 'Network aliases')+ ?.parentElement.querySelector('input')?.value === 'api.internal'+ JS)+ ->assertValue('name', $updatedName)->assertScript(<<<'JS'() => [...document.querySelectorAll('#internal-access-section label')].find((label) => label.textContent.trim() === 'Exposed ports')?.parentElement.querySelector('input')?.value === '8080'JS)+ ->wait(0.5)+ ->assertScript("() => document.querySelector('input[name=portsExposes]')?.checkVisibility() === false")+ ->assertNoJavaScriptErrors()->screenshot(filename: 'application-general-after-save');$this->application->refresh();expect($this->application->name)->toBe($updatedName)->and($this->application->description)->toBe('Updated via browser test')- ->and($this->application->ports_exposes)->toBe('8080');+ ->and($this->application->ports_exposes)->toBe('8080')+ ->and($this->application->custom_network_aliases)->toBe('api.internal');$reloaded = visit($url);$reloaded->assertValue('name', $updatedName)