diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php index 66c4cfc60..65e94dd23 100644 --- a/resources/views/livewire/project/application/general.blade.php +++ b/resources/views/livewire/project/application/general.blade.php @@ -12,6 +12,12 @@
{{ $application->compose_parsing_version }}
@endif Save + @if ($application->build_pack === 'dockercompose') + + {{ $application->docker_compose_raw ? 'Reload Compose File' : 'Load Compose File' }} + + @endif
General configuration for your application.
@@ -40,9 +46,10 @@ @if ($application->build_pack === 'dockercompose') @if ( - !is_null($parsedServices) && + !is_null($parsedServices) && count($parsedServices) > 0 && - !$application->settings->is_raw_compose_deployment_enabled) + !$application->settings->is_raw_compose_deployment_enabled + )

Domains

@foreach (data_get($parsedServices, 'services') as $serviceName => $service) @if (!isDatabaseImage(data_get($service, 'image'))) @@ -73,11 +80,11 @@ buttonTitle="Generate Default Nginx Configuration" buttonFullWidth submitAction="generateNginxConfiguration('{{ $application->settings->is_spa ? 'spa' : 'static' }}')" :actions="[ - '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') . - ').', - ]" /> + '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') . + ').', + ]" /> @endcan @endif
@@ -159,9 +166,8 @@
@if ($application->destination->server->isSwarm()) @if ($application->build_pack !== 'dockerimage') -
Docker Swarm requires the image to be available in a registry. More info here.
+
Docker Swarm requires the image to be available in a registry. More info here.
@endif @endif
@@ -173,19 +179,19 @@ helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')" x-bind:disabled="!canUpdate" /> @else - + @endif @else @if ( - $application->destination->server->isSwarm() || + $application->destination->server->isSwarm() || $application->additional_servers->count() > 0 || - $application->settings->is_build_server_enabled) - + $application->settings->is_build_server_enabled + ) + - + @endif @@ -233,16 +238,14 @@ @if ($application->build_pack === 'dockercompose') @can('update', $application)
- @else + @else
- @endcan + @endcan
- - +
@@ -257,29 +260,25 @@ know what are you doing.
- -
@if ($this->dockerComposeCustomBuildCommand)
-
@endif @if ($this->dockerComposeCustomStartCommand)
-
@@ -293,30 +292,27 @@
@endif
- @else + @else
+ helper="Directory to use as root. Useful for monorepos." x-bind:disabled="!canUpdate" /> @if ($application->build_pack === 'dockerfile' && !$application->dockerfile) - @endif @if ($application->build_pack === 'dockerfile') + helper="Useful if you have multi-staged dockerfile." x-bind:disabled="!canUpdate" /> @endif @if ($application->could_set_build_commands()) @if ($application->settings->is_static) - + @else - + @endif @endif @@ -332,8 +328,7 @@ + id="customDockerRunOptions" label="Custom Docker Options" x-bind:disabled="!canUpdate" /> @if ($application->build_pack !== 'dockercompose')
@@ -343,189 +338,204 @@ x-bind:disabled="!canUpdate" />
@endif - @endif -
+ @endif +
@endif -
- @if ($application->build_pack === 'dockercompose') -
-

Docker Compose

- @can('update', $application) - Reload Compose File - @endcan
- @if ($application->settings->is_raw_compose_deployment_enabled) - - @else - @if ((int) $application->compose_parsing_version >= 3) + @if ($application->build_pack === 'dockercompose') +
+
+

Docker Compose

+ +
+ @if ($application->settings->is_raw_compose_deployment_enabled) - @endif - - @endif -
- - {{-- --}} -
- @endif - @if ($application->dockerfile) - - @endif - @if ($application->build_pack !== 'dockercompose') -

Network

- @if ($this->detectedPortInfo) - @if ($this->detectedPortInfo['isEmpty']) -
- - - -
- PORT environment variable detected ({{ $this->detectedPortInfo['port'] }}) -

Your Ports Exposes field is empty. Consider setting it to {{ $this->detectedPortInfo['port'] }} to ensure the proxy routes traffic correctly.

-
-
- @elseif (!$this->detectedPortInfo['matches']) -
- - - -
- PORT mismatch detected -

Your PORT environment variable is set to {{ $this->detectedPortInfo['port'] }}, but it's not in your Ports Exposes configuration. Ensure they match for proper proxy routing.

-
-
@else -
- - - -
- PORT environment variable configured -

Your PORT environment variable ({{ $this->detectedPortInfo['port'] }}) matches your Ports Exposes configuration.

+ @if ((int) $application->compose_parsing_version >= 3) +
+
+ @endif +
+
@endif +
+ + {{-- --}} +
+
@endif -
- @if ($application->settings->is_static || $application->build_pack === 'static') - - @else - @if ($application->settings->is_container_label_readonly_enabled === false) - + @if ($application->dockerfile) + + @endif + @if ($application->build_pack !== 'dockercompose') +

Network

+ @if ($this->detectedPortInfo) + @if ($this->detectedPortInfo['isEmpty']) +
+ + + +
+ PORT environment variable detected + ({{ $this->detectedPortInfo['port'] }}) +

Your Ports Exposes field is empty. Consider setting it to + {{ $this->detectedPortInfo['port'] }} to ensure the proxy routes traffic + correctly.

+
+
+ @elseif (!$this->detectedPortInfo['matches']) +
+ + + +
+ PORT mismatch detected +

Your PORT environment variable is set to + {{ $this->detectedPortInfo['port'] }}, but it's not in your Ports Exposes + configuration. Ensure they match for proper proxy routing.

+
+
@else - +
+ + + +
+ PORT environment variable configured +

Your PORT environment variable ({{ $this->detectedPortInfo['port'] }}) matches + your Ports Exposes configuration.

+
+
@endif @endif - @if (!$application->destination->server->isSwarm()) - - @endif - @if (!$application->destination->server->isSwarm()) - - @endif -
- -

HTTP Basic Authentication

-
-
- +
+ @if ($application->settings->is_static || $application->build_pack === 'static') + + @else + @if ($application->settings->is_container_label_readonly_enabled === false) + + @else + + @endif + @endif + @if (!$application->destination->server->isSwarm()) + + @endif + @if (!$application->destination->server->isSwarm()) + + @endif
- @if ($application->is_http_basic_auth_enabled) -
- - -
- @endif -
- @if ($application->settings->is_container_label_readonly_enabled) - - @else - - @endif -
- - -
- @can('update', $application) - HTTP Basic Authentication +
+
+ +
+ @if ($application->is_http_basic_auth_enabled) +
+ + +
+ @endif +
+ + @if ($application->settings->is_container_label_readonly_enabled) + + @else + + @endif +
+ + +
+ @can('update', $application) + - @endcan - @endif + confirmationLabel="Please confirm the execution of the actions by entering the Application URL below" + shortConfirmationLabel="Application URL" :confirmWithPassword="false" + step2ButtonText="Permanently Reset Labels" /> + @endcan + @endif -

Pre/Post Deployment Commands

-
- - @if ($application->build_pack === 'dockercompose') - - @endif +

Pre/Post Deployment Commands

+
+ + @if ($application->build_pack === 'dockercompose') + + @endif +
+
+ + @if ($application->build_pack === 'dockercompose') + + @endif +
-
- - @if ($application->build_pack === 'dockercompose') - - @endif -
-
- + @script - + @endscript -
+
\ No newline at end of file