fix: server adding process

2023-11-21 12:07:06 +01:00
parent e78b6758d8
commit 4a21102983
13 changed files with 46 additions and 38 deletions
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html data-theme="coollabs" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -25,6 +26,7 @@
    @endif
 </head>
@section('body')
+
    <body>
        @livewireScripts
        <dialog id="help" class="modal">
@@ -120,6 +122,9 @@
            Livewire.on('success', (message) => {
                if (message) Toaster.success(message)
            })
+            Livewire.on('installDocker', () => {
+                installDocker.showModal();
+            })
        </script>
    </body>
@show
--- a/resources/views/livewire/boarding/index.blade.php
+++ b/resources/views/livewire/boarding/index.blade.php
@@ -225,8 +225,7 @@
                    Could not find Docker Engine on your server. Do you want me to install it for you?
                </x-slot:question>
                <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="installDocker"
-                    onclick="installDocker.showModal()">
+                    <x-forms.button class="justify-center box" wire:click="installDocker">
                    Let's do it!</x-forms.button>
                    @if ($dockerInstallationStarted)
                        <x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
@@ -235,9 +234,10 @@
                </x-slot:actions>
                <x-slot:explanation>
                    <p>This will install the latest Docker Engine on your server, configure a few things to be able
-                        to run optimal.</p>
+                        to run optimal.<br><br>Minimum Docker Engine version is: 22<br><br>To manually install Docker Engine, check <a target="_blank" class="underline text-warning" href="https://coolify.io/docs/servers#install-docker-engine-manually">this documentation</a>.</p>
                </x-slot:explanation>
            </x-boarding-step>
+
        @endif
    </div>
    <div>
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -64,9 +64,4 @@
                helper="Disk cleanup job will be executed if disk usage is more than this number." />
        @endif
    </form>
-    <script>
-        Livewire.on('installDocker', () => {
-            installDocker.showModal();
-        })
-    </script>
 </div>