rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7106 from coollabsio/next

Browse source 
v4.0.0-beta.441
This commit is contained in:
Andras Bacsai 2025-11-05 09:11:52 +01:00 committed by GitHub
commit 393df11486
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 89 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Actions/Database/StartClickhouse.php
View file

@ -105,7 +105,7 @@ public function handle(StandaloneClickhouse $database)
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md"; $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
$this->commands[] = "echo 'Pulling {$database->image} image.'"; $this->commands[] = "echo 'Pulling {$database->image} image.'";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
$this->commands[] = "echo 'Database started.'"; $this->commands[] = "echo 'Database started.'";

2
app/Actions/Database/StartDragonfly.php
View file

@ -192,7 +192,7 @@ public function handle(StandaloneDragonfly $database)
if ($this->database->enable_ssl) { if ($this->database->enable_ssl) {
$this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt"; $this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
} }
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
$this->commands[] = "echo 'Database started.'"; $this->commands[] = "echo 'Database started.'";

2
app/Actions/Database/StartKeydb.php
View file

@ -208,7 +208,7 @@ public function handle(StandaloneKeydb $database)
if ($this->database->enable_ssl) { if ($this->database->enable_ssl) {
$this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt"; $this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
} }
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
$this->commands[] = "echo 'Database started.'"; $this->commands[] = "echo 'Database started.'";

2
app/Actions/Database/StartMariadb.php
View file

@ -209,7 +209,7 @@ public function handle(StandaloneMariadb $database)
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md"; $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
$this->commands[] = "echo 'Pulling {$database->image} image.'"; $this->commands[] = "echo 'Pulling {$database->image} image.'";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
$this->commands[] = "echo 'Database started.'"; $this->commands[] = "echo 'Database started.'";

2
app/Actions/Database/StartMongodb.php
View file

@ -260,7 +260,7 @@ public function handle(StandaloneMongodb $database)
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md"; $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
$this->commands[] = "echo 'Pulling {$database->image} image.'"; $this->commands[] = "echo 'Pulling {$database->image} image.'";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
if ($this->database->enable_ssl) { if ($this->database->enable_ssl) {

2
app/Actions/Database/StartMysql.php
View file

@ -210,7 +210,7 @@ public function handle(StandaloneMysql $database)
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md"; $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
$this->commands[] = "echo 'Pulling {$database->image} image.'"; $this->commands[] = "echo 'Pulling {$database->image} image.'";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";

4
app/Actions/Database/StartPostgresql.php
View file

@ -223,7 +223,7 @@ public function handle(StandalonePostgresql $database)
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md"; $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
$this->commands[] = "echo 'Pulling {$database->image} image.'"; $this->commands[] = "echo 'Pulling {$database->image} image.'";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
if ($this->database->enable_ssl) { if ($this->database->enable_ssl) {
@ -231,8 +231,6 @@ public function handle(StandalonePostgresql $database)
} }
$this->commands[] = "echo 'Database started.'"; $this->commands[] = "echo 'Database started.'";
ray($this->commands);
return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged'); return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
} }

2
app/Actions/Database/StartRedis.php
View file

@ -205,7 +205,7 @@ public function handle(StandaloneRedis $database)
if ($this->database->enable_ssl) { if ($this->database->enable_ssl) {
$this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt"; $this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
} }
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true"; $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true"; $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
$this->commands[] = "echo 'Database started.'"; $this->commands[] = "echo 'Database started.'";

2
app/Actions/Database/StopDatabase.php
View file

@ -49,7 +49,7 @@ private function stopContainer($database, string $containerName, int $timeout =
{ {
$server = $database->destination->server; $server = $database->destination->server;
instant_remote_process(command: [ instant_remote_process(command: [
"docker stop --timeout=$timeout $containerName", "docker stop --time=$timeout $containerName",
"docker rm -f $containerName", "docker rm -f $containerName",
], server: $server, throwError: false); ], server: $server, throwError: false);
} }

8
app/Livewire/Project/Service/ServiceApplicationView.php
View file

@ -157,10 +157,10 @@ public function syncData(bool $toModel = false): void
$this->description = $this->application->description; $this->description = $this->application->description;
$this->fqdn = $this->application->fqdn; $this->fqdn = $this->application->fqdn;
$this->image = $this->application->image; $this->image = $this->application->image;
$this->excludeFromStatus = $this->application->exclude_from_status; $this->excludeFromStatus = data_get($this->application, 'exclude_from_status', false);
$this->isLogDrainEnabled = $this->application->is_log_drain_enabled; $this->isLogDrainEnabled = data_get($this->application, 'is_log_drain_enabled', false);
$this->isGzipEnabled = $this->application->is_gzip_enabled; $this->isGzipEnabled = data_get($this->application, 'is_gzip_enabled', true);
$this->isStripprefixEnabled = $this->application->is_stripprefix_enabled; $this->isStripprefixEnabled = data_get($this->application, 'is_stripprefix_enabled', true);
} }
} }

2
config/constants.php
View file

@ -2,7 +2,7 @@
return [ return [
'coolify' => [ 'coolify' => [
'version' => '4.0.0-beta.440', 'version' => '4.0.0-beta.441',
'helper_version' => '1.0.11', 'helper_version' => '1.0.11',
'realtime_version' => '1.0.10', 'realtime_version' => '1.0.10',
'self_hosted' => env('SELF_HOSTED', true), 'self_hosted' => env('SELF_HOSTED', true),

4
other/nightly/versions.json
View file

@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.440" "version": "4.0.0-beta.441"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.441" "version": "4.0.0-beta.442"
}, },
"helper": { "helper": {
"version": "1.0.11" "version": "1.0.11"

2
resources/css/utilities.css
View file

@ -152,7 +152,7 @@ @utility custom-modal {
} }
@utility navbar-main { @utility navbar-main {
@apply flex flex-col gap-4 justify-items-start pb-2 border-b-2 border-solid h-fit md:flex-row sm:justify-between dark:border-coolgray-200 border-neutral-200 md:items-center; @apply flex flex-col gap-4 justify-items-start pb-2 border-b-2 border-solid h-fit md:flex-row sm:justify-between dark:border-coolgray-200 border-neutral-200 md:items-center text-neutral-700 dark:text-neutral-400;
} }
@utility loading { @utility loading {

9
resources/views/layouts/app.blade.php
View file

@ -17,7 +17,8 @@
localStorage.setItem('pageWidth', 'full'); localStorage.setItem('pageWidth', 'full');
} }
} }
}" x-cloak class="mx-auto" :class="pageWidth === 'full' ? '' : 'max-w-7xl'"> }" x-cloak class="mx-auto dark:text-inherit text-black"
:class="pageWidth === 'full' ? '' : 'max-w-7xl'">
<div class="relative z-50 lg:hidden" :class="open ? 'block' : 'hidden'" role="dialog" aria-modal="true"> <div class="relative z-50 lg:hidden" :class="open ? 'block' : 'hidden'" role="dialog" aria-modal="true">
<div class="fixed inset-0 bg-black/80" x-on:click="open = false"></div> <div class="fixed inset-0 bg-black/80" x-on:click="open = false"></div>
<div class="fixed inset-y-0 right-0 h-full flex"> <div class="fixed inset-y-0 right-0 h-full flex">
@ -45,9 +46,11 @@
</div> </div>
</div> </div>
<div class="sticky top-0 z-40 flex items-center justify-between px-4 py-4 gap-x-6 sm:px-6 lg:hidden bg-white/95 dark:bg-base/95 backdrop-blur-sm border-b border-neutral-300/50 dark:border-coolgray-200/50"> <div
class="sticky top-0 z-40 flex items-center justify-between px-4 py-4 gap-x-6 sm:px-6 lg:hidden bg-white/95 dark:bg-base/95 backdrop-blur-sm border-b border-neutral-300/50 dark:border-coolgray-200/50">
<div class="flex items-center gap-3 flex-shrink-0"> <div class="flex items-center gap-3 flex-shrink-0">
<a href="/" class="text-xl font-bold tracking-wide dark:text-white hover:opacity-80 transition-opacity">Coolify</a> <a href="/"
class="text-xl font-bold tracking-wide dark:text-white hover:opacity-80 transition-opacity">Coolify</a>
<livewire:switch-team /> <livewire:switch-team />
</div> </div>
<button type="button" class="-m-2.5 p-2.5 dark:text-warning" x-on:click="open = !open"> <button type="button" class="-m-2.5 p-2.5 dark:text-warning" x-on:click="open = !open">

4
resources/views/layouts/base.blade.php
View file

@ -6,13 +6,15 @@
const t = localStorage.theme || 'dark'; const t = localStorage.theme || 'dark';
const d = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches); const d = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches);
document.documentElement.classList[d ? 'add' : 'remove']('dark'); document.documentElement.classList[d ? 'add' : 'remove']('dark');
document.documentElement.setAttribute('data-theme', d ? 'dark' : 'light');
})(); })();
</script> </script>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="robots" content="noindex"> <meta name="robots" content="noindex">
<meta name="theme-color" content="#101010" id="theme-color-meta" /> <meta name="theme-color" content="#ffffff" id="theme-color-meta" />
<meta name="color-scheme" content="dark light" /> <meta name="color-scheme" content="dark light" />
<meta name="Description" content="Coolify: An open-source & self-hostable Heroku / Netlify / Vercel alternative" /> <meta name="Description" content="Coolify: An open-source & self-hostable Heroku / Netlify / Vercel alternative" />
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />

80
resources/views/livewire/project/application/general.blade.php
View file

@ -23,16 +23,15 @@
@if (!$application->dockerfile && $application->build_pack !== 'dockerimage') @if (!$application->dockerfile && $application->build_pack !== 'dockerimage')
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<div class="flex gap-2"> <div class="flex gap-2">
<x-forms.select x-bind:disabled="shouldDisable()" wire:model.live="buildPack" <x-forms.select x-bind:disabled="shouldDisable()" wire:model.live="buildPack" label="Build Pack"
label="Build Pack" required> required>
<option value="nixpacks">Nixpacks</option> <option value="nixpacks">Nixpacks</option>
<option value="static">Static</option> <option value="static">Static</option>
<option value="dockerfile">Dockerfile</option> <option value="dockerfile">Dockerfile</option>
<option value="dockercompose">Docker Compose</option> <option value="dockercompose">Docker Compose</option>
</x-forms.select> </x-forms.select>
@if ($application->settings->is_static || $application->build_pack === 'static') @if ($application->settings->is_static || $application->build_pack === 'static')
<x-forms.select x-bind:disabled="!canUpdate" id="staticImage" <x-forms.select x-bind:disabled="!canUpdate" id="staticImage" label="Static Image" required>
label="Static Image" required>
<option value="nginx:alpine">nginx:alpine</option> <option value="nginx:alpine">nginx:alpine</option>
<option disabled value="apache:alpine">apache:alpine</option> <option disabled value="apache:alpine">apache:alpine</option>
</x-forms.select> </x-forms.select>
@ -75,7 +74,9 @@
submitAction="generateNginxConfiguration('{{ $application->settings->is_spa ? 'spa' : 'static' }}')" submitAction="generateNginxConfiguration('{{ $application->settings->is_spa ? 'spa' : 'static' }}')"
:actions="[ :actions="[
'This will overwrite your current custom Nginx configuration.', 'This will overwrite your current custom Nginx configuration.',
'The default configuration will be generated based on your application type (' . ($application->settings->is_spa ? 'SPA' : 'static') . ').', 'The default configuration will be generated based on your application type (' .
($application->settings->is_spa ? 'SPA' : 'static') .
').',
]" /> ]" />
@endcan @endcan
@endif @endif
@ -94,13 +95,11 @@
@if ($application->build_pack !== 'dockercompose') @if ($application->build_pack !== 'dockercompose')
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
@if ($application->settings->is_container_label_readonly_enabled == false) @if ($application->settings->is_container_label_readonly_enabled == false)
<x-forms.input placeholder="https://coolify.io" wire:model="fqdn" <x-forms.input placeholder="https://coolify.io" wire:model="fqdn" label="Domains" readonly
label="Domains" readonly
helper="Readonly labels are disabled. You can set the domains in the labels section." helper="Readonly labels are disabled. You can set the domains in the labels section."
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
@else @else
<x-forms.input placeholder="https://coolify.io" wire:model="fqdn" <x-forms.input placeholder="https://coolify.io" wire:model="fqdn" label="Domains"
label="Domains"
helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
@can('update', $application) @can('update', $application)
@ -210,21 +209,17 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
<x-forms.input <x-forms.input
helper="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>" helper="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" 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" id="customDockerRunOptions" label="Custom Docker Options" x-bind:disabled="!canUpdate" />
x-bind:disabled="!canUpdate" />
@else @else
@if ($application->could_set_build_commands()) @if ($application->could_set_build_commands())
@if ($application->build_pack === 'nixpacks') @if ($application->build_pack === 'nixpacks')
<div class="flex flex-col gap-2 xl:flex-row"> <div class="flex flex-col gap-2 xl:flex-row">
<x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml" <x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml"
id="installCommand" label="Install Command" id="installCommand" label="Install Command" x-bind:disabled="!canUpdate" />
x-bind:disabled="!canUpdate" />
<x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml" <x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml"
id="buildCommand" label="Build Command" id="buildCommand" label="Build Command" x-bind:disabled="!canUpdate" />
x-bind:disabled="!canUpdate" />
<x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml" <x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml"
id="startCommand" label="Start Command" id="startCommand" label="Start Command" x-bind:disabled="!canUpdate" />
x-bind:disabled="!canUpdate" />
</div> </div>
<div class="pt-1 text-xs">Nixpacks will detect the required configuration <div class="pt-1 text-xs">Nixpacks will detect the required configuration
automatically. automatically.
@ -246,13 +241,12 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
id="baseDirectory" label="Base Directory" id="baseDirectory" label="Base Directory"
helper="Directory to use as root. Useful for monorepos." /> helper="Directory to use as root. Useful for monorepos." />
<x-forms.input x-bind:disabled="shouldDisable()" <x-forms.input x-bind:disabled="shouldDisable()"
placeholder="/docker-compose.yaml" placeholder="/docker-compose.yaml" id="dockerComposeLocation"
id="dockerComposeLocation" label="Docker Compose Location" label="Docker Compose Location"
helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }}</span>" /> helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }}</span>" />
</div> </div>
<div class="w-96"> <div class="w-96">
<x-forms.checkbox instantSave <x-forms.checkbox instantSave id="isPreserveRepositoryEnabled"
id="isPreserveRepositoryEnabled"
label="Preserve Repository During Deployment" label="Preserve Repository During Deployment"
helper="Git repository (based on the base directory settings) will be copied to the deployment directory." helper="Git repository (based on the base directory settings) will be copied to the deployment directory."
x-bind:disabled="shouldDisable()" /> x-bind:disabled="shouldDisable()" />
@ -264,13 +258,11 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
you doing.</div> you doing.</div>
<div class="flex gap-2"> <div class="flex gap-2">
<x-forms.input x-bind:disabled="shouldDisable()" <x-forms.input x-bind:disabled="shouldDisable()"
placeholder="docker compose build" placeholder="docker compose build" id="dockerComposeCustomBuildCommand"
id="dockerComposeCustomBuildCommand"
helper="If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>So in your case, use: <span class='dark:text-warning'>docker compose -f .{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }} build</span>" helper="If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>So in your case, use: <span class='dark:text-warning'>docker compose -f .{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }} build</span>"
label="Custom Build Command" /> label="Custom Build Command" />
<x-forms.input x-bind:disabled="shouldDisable()" <x-forms.input x-bind:disabled="shouldDisable()"
placeholder="docker compose up -d" placeholder="docker compose up -d" id="dockerComposeCustomStartCommand"
id="dockerComposeCustomStartCommand"
helper="If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>So in your case, use: <span class='dark:text-warning'>docker compose -f .{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }} up -d</span>" helper="If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>So in your case, use: <span class='dark:text-warning'>docker compose -f .{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }} up -d</span>"
label="Custom Start Command" /> label="Custom Start Command" />
</div> </div>
@ -278,15 +270,14 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
<div class="pt-4"> <div class="pt-4">
<x-forms.textarea <x-forms.textarea
helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins." helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins."
placeholder="services/api/**" id="watchPaths" placeholder="services/api/**" id="watchPaths" label="Watch Paths"
label="Watch Paths" x-bind:disabled="shouldDisable()" /> x-bind:disabled="shouldDisable()" />
</div> </div>
@endif @endif
</div> </div>
@else @else
<div class="flex flex-col gap-2 xl:flex-row"> <div class="flex flex-col gap-2 xl:flex-row">
<x-forms.input placeholder="/" id="baseDirectory" <x-forms.input placeholder="/" id="baseDirectory" label="Base Directory"
label="Base Directory"
helper="Directory to use as root. Useful for monorepos." helper="Directory to use as root. Useful for monorepos."
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
@if ($application->build_pack === 'dockerfile' && !$application->dockerfile) @if ($application->build_pack === 'dockerfile' && !$application->dockerfile)
@ -297,8 +288,7 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
@endif @endif
@if ($application->build_pack === 'dockerfile') @if ($application->build_pack === 'dockerfile')
<x-forms.input id="dockerfileTargetBuild" <x-forms.input id="dockerfileTargetBuild" label="Docker Build Stage Target"
label="Docker Build Stage Target"
helper="Useful if you have multi-staged dockerfile." helper="Useful if you have multi-staged dockerfile."
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
@endif @endif
@ -317,8 +307,8 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
<div class="pb-4"> <div class="pb-4">
<x-forms.textarea <x-forms.textarea
helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins." helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins."
placeholder="src/pages/**" id="watchPaths" placeholder="src/pages/**" id="watchPaths" label="Watch Paths"
label="Watch Paths" x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
</div> </div>
@endif @endif
<x-forms.input <x-forms.input
@ -331,8 +321,8 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
<div class="pt-2 w-96"> <div class="pt-2 w-96">
<x-forms.checkbox <x-forms.checkbox
helper="Use a build server to build your application. You can configure your build server in the Server settings. For more info, check the <a href='https://coolify.io/docs/knowledge-base/server/build-server' class='underline' target='_blank'>documentation</a>." helper="Use a build server to build your application. You can configure your build server in the Server settings. For more info, check the <a href='https://coolify.io/docs/knowledge-base/server/build-server' class='underline' target='_blank'>documentation</a>."
instantSave id="isBuildServerEnabled" instantSave id="isBuildServerEnabled" label="Use a Build Server?"
label="Use a Build Server?" x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
</div> </div>
@endif @endif
@endif @endif
@ -359,8 +349,7 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
helper="You need to modify the docker compose file in the git repository." helper="You need to modify the docker compose file in the git repository."
monacoEditorLanguage="yaml" useMonacoEditor /> monacoEditorLanguage="yaml" useMonacoEditor />
@endif @endif
<x-forms.textarea rows="10" readonly id="dockerCompose" <x-forms.textarea rows="10" readonly id="dockerCompose" label="Docker Compose Content"
label="Docker Compose Content"
helper="You need to modify the docker compose file in the git repository." helper="You need to modify the docker compose file in the git repository."
monacoEditorLanguage="yaml" useMonacoEditor /> monacoEditorLanguage="yaml" useMonacoEditor />
@endif @endif
@ -386,13 +375,11 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
@else @else
@if ($application->settings->is_container_label_readonly_enabled === false) @if ($application->settings->is_container_label_readonly_enabled === false)
<x-forms.input placeholder="3000,3001" id="portsExposes" <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" readonly
label="Ports Exposes" readonly
helper="Readonly labels are disabled. You can set the ports manually in the labels section." helper="Readonly labels are disabled. You can set the ports manually in the labels section."
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
@else @else
<x-forms.input placeholder="3000,3001" id="portsExposes" <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" required
label="Ports Exposes" required
helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly." helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly."
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
@endif @endif
@ -413,15 +400,14 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
<div> <div>
<div class="w-96"> <div class="w-96">
<x-forms.checkbox helper="This will add the proper proxy labels to the container." instantSave <x-forms.checkbox helper="This will add the proper proxy labels to the container." instantSave
label="Enable" id="isHttpBasicAuthEnabled" label="Enable" id="isHttpBasicAuthEnabled" x-bind:disabled="!canUpdate" />
x-bind:disabled="!canUpdate" />
</div> </div>
@if ($application->is_http_basic_auth_enabled) @if ($application->is_http_basic_auth_enabled)
<div class="flex gap-2 py-2"> <div class="flex gap-2 py-2">
<x-forms.input id="httpBasicAuthUsername" label="Username" required <x-forms.input id="httpBasicAuthUsername" label="Username" required
x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
<x-forms.input id="httpBasicAuthPassword" type="password" label="Password" <x-forms.input id="httpBasicAuthPassword" type="password" label="Password" required
required x-bind:disabled="!canUpdate" /> x-bind:disabled="!canUpdate" />
</div> </div>
@endif @endif
</div> </div>
@ -472,8 +458,8 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
id="postDeploymentCommand" label="Post-deployment " 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." /> 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 ($application->build_pack === 'dockercompose') @if ($application->build_pack === 'dockercompose')
<x-forms.input x-bind:disabled="shouldDisable()" <x-forms.input x-bind:disabled="shouldDisable()" id="postDeploymentCommandContainer"
id="postDeploymentCommandContainer" label="Container Name" label="Container Name"
helper="The name of the container to execute within. You can leave it blank if your application only has one container." /> helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
@endif @endif
</div> </div>

55
resources/views/livewire/project/database/postgresql/general.blade.php
View file

@ -31,11 +31,11 @@
</div> </div>
@if ($database->started_at) @if ($database->started_at)
<div class="flex xl:flex-row flex-col gap-2"> <div class="flex xl:flex-row flex-col gap-2">
<x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
canGate="update" :canResource="$database" :canResource="$database"
helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." /> helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
<x-forms.input label="Password" id="postgresPassword" type="password" required <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
canGate="update" :canResource="$database" :canResource="$database"
helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." /> helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
<x-forms.input label="Initial Database" id="postgresDb" <x-forms.input label="Initial Database" id="postgresDb"
placeholder="If empty, it will be the same as Username." readonly placeholder="If empty, it will be the same as Username." readonly
@ -43,19 +43,19 @@
</div> </div>
@else @else
<div class="flex xl:flex-row flex-col gap-2 pb-2"> <div class="flex xl:flex-row flex-col gap-2 pb-2">
<x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
canGate="update" :canResource="$database" /> :canResource="$database" />
<x-forms.input label="Password" id="postgresPassword" type="password" required <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
canGate="update" :canResource="$database" /> :canResource="$database" />
<x-forms.input label="Initial Database" id="postgresDb" <x-forms.input label="Initial Database" id="postgresDb"
placeholder="If empty, it will be the same as Username." canGate="update" :canResource="$database" /> placeholder="If empty, it will be the same as Username." canGate="update" :canResource="$database" />
</div> </div>
@endif @endif
<div class="flex gap-2"> <div class="flex gap-2">
<x-forms.input label="Initial Database Arguments" canGate="update" :canResource="$database" <x-forms.input label="Initial Database Arguments" canGate="update" :canResource="$database" id="postgresInitdbArgs"
id="postgresInitdbArgs" placeholder="If empty, use default. See in docker docs." /> placeholder="If empty, use default. See in docker docs." />
<x-forms.input label="Host Auth Method" canGate="update" :canResource="$database" <x-forms.input label="Host Auth Method" canGate="update" :canResource="$database" id="postgresHostAuthMethod"
id="postgresHostAuthMethod" placeholder="If empty, use default. See in docker docs." /> placeholder="If empty, use default. See in docker docs." />
</div> </div>
<x-forms.input <x-forms.input
helper="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>" helper="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>"
@ -107,20 +107,19 @@
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<div class="w-64" wire:key='enable_ssl'> <div class="w-64" wire:key='enable_ssl'>
@if ($database->isExited()) @if ($database->isExited())
<x-forms.checkbox id="enableSsl" label="Enable SSL" <x-forms.checkbox id="enableSsl" label="Enable SSL" wire:model.live="enableSsl"
wire:model.live="enableSsl" instantSave="instantSaveSSL" canGate="update" instantSave="instantSaveSSL" canGate="update" :canResource="$database" />
:canResource="$database" />
@else @else
<x-forms.checkbox id="enableSsl" label="Enable SSL" <x-forms.checkbox id="enableSsl" label="Enable SSL" wire:model.live="enableSsl"
wire:model.live="enableSsl" instantSave="instantSaveSSL" disabled instantSave="instantSaveSSL" disabled
helper="Database should be stopped to change this settings." /> helper="Database should be stopped to change this settings." />
@endif @endif
</div> </div>
@if ($enableSsl) @if ($enableSsl)
<div class="mx-2"> <div class="mx-2">
@if ($database->isExited()) @if ($database->isExited())
<x-forms.select id="sslMode" label="SSL Mode" <x-forms.select id="sslMode" label="SSL Mode" wire:model.live="sslMode"
wire:model.live="sslMode" instantSave="instantSaveSSL" instantSave="instantSaveSSL"
helper="Choose the SSL verification mode for PostgreSQL connections" canGate="update" helper="Choose the SSL verification mode for PostgreSQL connections" canGate="update"
:canResource="$database"> :canResource="$database">
<option value="allow" title="Allow insecure connections">allow (insecure)</option> <option value="allow" title="Allow insecure connections">allow (insecure)</option>
@ -131,8 +130,8 @@
</option> </option>
</x-forms.select> </x-forms.select>
@else @else
<x-forms.select id="sslMode" label="SSL Mode" instantSave="instantSaveSSL" <x-forms.select id="sslMode" label="SSL Mode" instantSave="instantSaveSSL" disabled
disabled helper="Database should be stopped to change this settings."> helper="Database should be stopped to change this settings.">
<option value="allow" title="Allow insecure connections">allow (insecure)</option> <option value="allow" title="Allow insecure connections">allow (insecure)</option>
<option value="prefer" title="Prefer secure connections">prefer (secure)</option> <option value="prefer" title="Prefer secure connections">prefer (secure)</option>
<option value="require" title="Require secure connections">require (secure)</option> <option value="require" title="Require secure connections">require (secure)</option>
@ -164,22 +163,24 @@
<x-forms.checkbox instantSave id="isPublic" label="Make it publicly available" <x-forms.checkbox instantSave id="isPublic" label="Make it publicly available"
canGate="update" :canResource="$database" /> canGate="update" :canResource="$database" />
</div> </div>
<x-forms.input placeholder="5432" disabled="{{ $isPublic }}" <x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort"
id="publicPort" label="Public Port" canGate="update" :canResource="$database" /> label="Public Port" canGate="update" :canResource="$database" />
</div> </div>
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" <x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" id="postgresConf"
id="postgresConf" canGate="update" :canResource="$database" /> canGate="update" :canResource="$database" />
</div> </div>
</div>
</div>
</form> </form>
<div class="flex flex-col gap-4 pt-4"> <div class="flex flex-col gap-4 pt-4">
<h3>Advanced</h3> <h3>Advanced</h3>
<div class="flex flex-col"> <div class="flex flex-col">
<x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings." <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
instantSave="instantSaveAdvanced" id="isLogDrainEnabled" label="Drain Logs" instantSave="instantSaveAdvanced" id="isLogDrainEnabled" label="Drain Logs" canGate="update"
canGate="update" :canResource="$database" /> :canResource="$database" />
</div> </div>
<div class="pb-16"> <div class="pb-16">

4
versions.json
View file

@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.440" "version": "4.0.0-beta.441"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.441" "version": "4.0.0-beta.442"
}, },
"helper": { "helper": {
"version": "1.0.11" "version": "1.0.11"