Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: in services should edit compose file for volumes and envs

Browse Source
This commit is contained in:
Andras Bacsai 2024-06-13 10:18:35 +02:00
parent 7a63a17b66
commit 95d3ebdc2d
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/livewire/project/service/configuration.blade.php
View File

@ -172,7 +172,8 @@
<h2>Storages</h2> <h2>Storages</h2>
</div> </div>
<div class="pb-4">Persistent storage to preserve data between deployments.</div> <div class="pb-4">Persistent storage to preserve data between deployments.</div>
<span class="dark:text-warning">Please modify storage layout in your Docker Compose file.</span> <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a volume, you must add it to
your compose file (General tab).</div>
@foreach ($applications as $application) @foreach ($applications as $application)
<livewire:project.service.storage wire:key="application-{{ $application->id }}" <livewire:project.service.storage wire:key="application-{{ $application->id }}"
:resource="$application" /> :resource="$application" />

8
resources/views/livewire/project/shared/environment-variable/all.blade.php
View File

@ -6,19 +6,21 @@
<x-modal-input buttonTitle="+ Add" title="New Environment Variable"> <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
<livewire:project.shared.environment-variable.add /> <livewire:project.shared.environment-variable.add />
</x-modal-input> </x-modal-input>
<x-forms.button
wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
@endif @endif
<x-forms.button
wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
</div> </div>
<div>Environment variables (secrets) for this resource.</div> <div>Environment variables (secrets) for this resource.</div>
@if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose') @if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose')
<div class="w-64 pt-2"> <div class="w-64 pt-2">
<x-forms.checkbox id="resource.settings.is_env_sorting_enabled" label="Sort alphabetically" <x-forms.checkbox id="resource.settings.is_env_sorting_enabled" label="Sort alphabetically"
helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order." instantSave></x-forms.checkbox> helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order."
instantSave></x-forms.checkbox>
</div> </div>
@endif @endif
@if ($resource->type() === 'service' || $resource?->build_pack === 'dockercompose') @if ($resource->type() === 'service' || $resource?->build_pack === 'dockercompose')
<div class="pt-4 dark:text-warning text-coollabs">Hardcoded variables are not shown here.</div> <div class="pt-4 dark:text-warning text-coollabs">Hardcoded variables are not shown here.</div>
<div class="pb-4 dark:text-warning text-coollabs">If you would like to add a variable, you must add it to your compose file (General tab).</div>
@endif @endif
</div> </div>
@if ($view === 'normal') @if ($view === 'normal')

13
resources/views/livewire/project/shared/storages/show.blade.php
View File

@ -2,8 +2,15 @@
<form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row"> <form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
@if ($isReadOnly) @if ($isReadOnly)
@if ($isFirst) @if ($isFirst)
<x-forms.input id="storage.name" label="Volume Name" required @if (
helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." /> $storage->resource_type === 'App\Models\ServiceApplication' ||
$storage->resource_type === 'App\Models\ServiceDatabase')
<x-forms.input id="storage.name" label="Volume Name" required readonly
helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
@else
<x-forms.input id="storage.name" label="Volume Name" required
helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
@endif
@if ($isService || $startedAt) @if ($isService || $startedAt)
<x-forms.input id="storage.host_path" readonly helper="Directory on the host system." <x-forms.input id="storage.host_path" readonly helper="Directory on the host system."
label="Source Path" label="Source Path"
@ -19,7 +26,7 @@
</x-forms.button> </x-forms.button>
@else @else
<x-forms.input id="storage.name" required readonly /> <x-forms.input id="storage.name" required readonly />
<x-forms.input id="storage.host_path" readonly /> <x-forms.input id="storage.host_path" readonly />
<x-forms.input id="storage.mount_path" required readonly /> <x-forms.input id="storage.mount_path" required readonly />
@endif @endif
@else @else