Skip to content

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.

Merge remote-tracking branch 'origin/next' into jean/organize-service-ui

Andras Bacsai07c6b02a82be
diff --cc resources/views/livewire/project/service/index.blade.php
index 7cb61935f5,f4caedb8de..bfdd237181
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@@ -26,9 -23,63 +26,9 @@@
{{ data_get_str($service, 'name')->limit(10) }} >
{{ data_get_str($serviceApplication, 'name')->limit(10) }} | Coolify
</x-slot>
- <form wire:submit='submitApplication'>
- <div class="flex items-center gap-2 pb-4">
- @if ($serviceApplication->human_name)
- <h2>{{ Str::headline($serviceApplication->human_name) }}</h2>
- @else
- <h2>{{ Str::headline($serviceApplication->name) }}</h2>
- @endif
- <x-forms.button canGate="update" :canResource="$serviceApplication" type="submit">Save</x-forms.button>
- @can('update', $serviceApplication)
- <x-modal-confirmation wire:click="convertToDatabase" title="Convert to Database"
- buttonTitle="Convert to Database" submitAction="convertToDatabase" :actions="['The selected resource will be converted to a service database.']"
- confirmationText="{{ Str::headline($serviceApplication->name) }}"
- confirmationLabel="Please confirm the execution of the actions by entering the Service Application Name below"
- shortConfirmationLabel="Service Application Name" />
- @endcan
- @can('delete', $serviceApplication)
- <x-modal-confirmation title="Confirm Service Application Deletion?" buttonTitle="Delete" isErrorButton
- submitAction="deleteApplication" :actions="['The selected service application container will be stopped and permanently deleted.']"
- confirmationText="{{ Str::headline($serviceApplication->name) }}"
- confirmationLabel="Please confirm the execution of the actions by entering the Service Application Name below"
- shortConfirmationLabel="Service Application Name" />
- @endcan
- </div>
- <div class="flex flex-col gap-2">
- @if ($requiredPort && !$serviceApplication->serviceType()?->contains(str($serviceApplication->image)->before(':')))
- <x-callout type="warning" title="Required Port: {{ $requiredPort }}" class="mb-2">
- This service requires port <strong>{{ $requiredPort }}</strong> to function correctly. All domains must include this port number (or any other port if you know what you're doing).
- <br><br>
- <strong>Example:</strong> http://app.coolify.io:{{ $requiredPort }}
- </x-callout>
- @endif
-
- <div class="flex gap-2">
- <x-forms.input canGate="update" :canResource="$serviceApplication" label="Name" id="humanName"
- placeholder="Human readable name"></x-forms.input>
- <x-forms.input canGate="update" :canResource="$serviceApplication" label="Description"
- id="description"></x-forms.input>
- </div>
- <div class="flex gap-2">
- @if (!$serviceApplication->serviceType()?->contains(str($serviceApplication->image)->before(':')))
- @if ($serviceApplication->required_fqdn)
- <x-forms.input canGate="update" :canResource="$serviceApplication" required placeholder="https://app.coolify.io"
- label="Domains" id="fqdn"
- 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-forms.input>
- @else
- <x-forms.input canGate="update" :canResource="$serviceApplication" placeholder="https://app.coolify.io"
- label="Domains" id="fqdn"
- 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-forms.input>
- @endif
- @endif
- <x-forms.input canGate="update" :canResource="$serviceApplication"
- helper="You can change the image you would like to deploy.<br><br><span class='dark:text-warning'>WARNING. You could corrupt your data. Only do it if you know what you are doing.</span>"
- label="Image" id="image"></x-forms.input>
- </div>
- </div>
- <h3 class="py-2 pt-4">Advanced</h3>
- <div class="w-96 flex flex-col gap-1">
+ @if ($currentRoute === 'project.service.index.advanced')
+ <h2>Advanced</h2>
- <div class="w-96 flex flex-col gap-1 pt-4">
++ <div class="w-full sm:w-96 flex flex-col gap-1 pt-4">
@if (str($serviceApplication->image)->contains('pocketbase'))
<x-forms.checkbox canGate="update" :canResource="$serviceApplication" instantSave="instantSaveApplicationSettings" id="isGzipEnabled"
label="Enable Gzip Compression"
@@@ -184,17 -178,6 +184,17 @@@
</x-slot>
@if ($currentRoute === 'project.service.database.import')
<livewire:project.database.import :resource="$serviceDatabase" :key="'import-' . $serviceDatabase->uuid" />
+ @elseif ($currentRoute === 'project.service.index.advanced')
+ <h2>Advanced</h2>
- <div class="w-96 flex flex-col gap-1 pt-4">
++ <div class="w-full sm:w-96 flex flex-col gap-1 pt-4">
+ <x-forms.checkbox canGate="update" :canResource="$serviceDatabase" instantSave="instantSaveExclude"
+ label="Exclude from service status"
+ helper="If you do not need to monitor this resource, enable. Useful if this service is optional."
+ id="excludeFromStatus"></x-forms.checkbox>
+ <x-forms.checkbox canGate="update" :canResource="$serviceDatabase"
+ helper="Drain logs to your configured log drain endpoint in your Server settings."
+ instantSave="instantSaveLogDrain" id="isLogDrainEnabled" label="Drain Logs" />
+ </div>
@else
<form wire:submit='submitDatabase'>
<div class="flex items-center gap-2 pb-4">
diff --cc resources/views/livewire/project/service/stack-form.blade.php
index ab26e0b71d,415077cc57..e63e7a5092
--- a/resources/views/livewire/project/service/stack-form.blade.php
+++ b/resources/views/livewire/project/service/stack-form.blade.php
@@@ -20,10 -20,7 +20,10 @@@
placeholder="My super WordPress site" />
<x-forms.input canGate="update" :canResource="$service" id="description" label="Description" />
</div>
+ <div>
+ <h3>Network</h3>
+ </div>
- <div class="w-96">
+ <div class="w-full sm:w-96">
<x-forms.checkbox canGate="update" :canResource="$service" instantSave id="connectToDockerNetwork"
label="Connect To Predefined Network"
helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='underline dark:text-white' target='_blank' href='https://coolify.io/docs/knowledge-base/docker/compose#connect-to-predefined-networks'>this</a>." />
diff --cc routes/web.php
index 7ccfb709ae,6d70b42239..fad3c5d297
--- a/routes/web.php
+++ b/routes/web.php
@@@ -262,9 -267,8 +267,9 @@@ Route::middleware(['auth', 'verified'])
Route::get('/terminal', ExecuteContainerCommand::class)->name('project.service.command')->middleware('can.access.terminal');
Route::get('/{stack_service_uuid}/backups', ServiceDatabaseBackups::class)->name('project.service.database.backups');
Route::get('/{stack_service_uuid}/import', ServiceIndex::class)->name('project.service.database.import')->middleware('can.update.resource');
+ Route::get('/{stack_service_uuid}/advanced', ServiceIndex::class)->name('project.service.index.advanced');
Route::get('/{stack_service_uuid}', ServiceIndex::class)->name('project.service.index');
- Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.service.scheduled-tasks');
+ Route::get('/tasks/{task_uuid}', ServiceConfiguration::class)->name('project.service.scheduled-tasks');
});
Route::get('/servers', ServerIndex::class)->name('server.index');