From bfaefed1aea4864eb30e6c813a919279bae4e785 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Fri, 19 Sep 2025 13:45:37 +0200
Subject: [PATCH] refactor(environment): streamline rendering of Docker Build
 Secrets checkbox and adjust layout for environment variable settings

---
 .../shared/environment-variable/all.blade.php | 24 ++++++-------
 .../environment-variable/show.blade.php       | 34 +++++++++----------
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php
index 6854ffaa4..cee6b291d 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -28,19 +28,17 @@
                         @endcan
                     </div>
                 @endif
-                @if (data_get($resource, 'build_pack') !== 'dockercompose')
-                    <div class="w-64">
-                        @can('manageEnvironment', $resource)
-                            <x-forms.checkbox id="use_build_secrets" label="Use Docker Build Secrets"
-                                helper="Enable Docker BuildKit secrets for enhanced security during builds. Secrets won't be exposed in the final image. Requires Docker 18.09+ with BuildKit support."
-                                instantSave></x-forms.checkbox>
-                        @else
-                            <x-forms.checkbox id="use_build_secrets" label="Use Docker Build Secrets"
-                                helper="Enable Docker BuildKit secrets for enhanced security during builds. Secrets won't be exposed in the final image. Requires Docker 18.09+ with BuildKit support."
-                                disabled></x-forms.checkbox>
-                        @endcan
-                    </div>
-                @endif
+                <div class="w-64">
+                    @can('manageEnvironment', $resource)
+                        <x-forms.checkbox id="use_build_secrets" label="Use Docker Build Secrets"
+                            helper="Enable Docker BuildKit secrets for enhanced security during builds. Secrets won't be exposed in the final image. Requires Docker 18.09+ with BuildKit support."
+                            instantSave></x-forms.checkbox>
+                    @else
+                        <x-forms.checkbox id="use_build_secrets" label="Use Docker Build Secrets"
+                            helper="Enable Docker BuildKit secrets for enhanced security during builds. Secrets won't be exposed in the final image. Requires Docker 18.09+ with BuildKit support."
+                            disabled></x-forms.checkbox>
+                    @endcan
+                </div>
             </div>
         @endif
         @if ($resource->type() === 'service' || $resource?->build_pack === 'dockercompose')
diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index 6598b66ff..953bc59fa 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -78,22 +78,20 @@
                                     @if ($isSharedVariable)
                                         <x-forms.checkbox instantSave id="is_multiline" label="Is Multiline?" />
                                     @else
-                                        @if (!$env->is_coolify)
-                                            @if (!$env->is_nixpacks)
-                                                <x-forms.checkbox instantSave id="is_buildtime"
-                                                    helper="Make this variable available during Docker build process. Useful for build secrets and dependencies."
-                                                    label="Available at Buildtime" />
-                                            @endif
-                                            <x-forms.checkbox instantSave id="is_runtime"
-                                                helper="Make this variable available in the running container at runtime."
-                                                label="Available at Runtime" />
-                                            @if (!$env->is_nixpacks)
-                                                <x-forms.checkbox instantSave id="is_multiline" label="Is Multiline?" />
-                                                @if ($is_multiline === false)
-                                                    <x-forms.checkbox instantSave id="is_literal"
-                                                        helper="This means that when you use $VARIABLES in a value, it should be interpreted as the actual characters '$VARIABLES' and not as the value of a variable named VARIABLE.<br><br>Useful if you have $ sign in your value and there are some characters after it, but you would not like to interpolate it from another value. In this case, you should set this to true."
-                                                        label="Is Literal?" />
-                                                @endif
+                                        @if (!$env->is_nixpacks)
+                                            <x-forms.checkbox instantSave id="is_buildtime"
+                                                helper="Make this variable available during Docker build process. Useful for build secrets and dependencies."
+                                                label="Available at Buildtime" />
+                                        @endif
+                                        <x-forms.checkbox instantSave id="is_runtime"
+                                            helper="Make this variable available in the running container at runtime."
+                                            label="Available at Runtime" />
+                                        @if (!$env->is_nixpacks)
+                                            <x-forms.checkbox instantSave id="is_multiline" label="Is Multiline?" />
+                                            @if ($is_multiline === false)
+                                                <x-forms.checkbox instantSave id="is_literal"
+                                                    helper="This means that when you use $VARIABLES in a value, it should be interpreted as the actual characters '$VARIABLES' and not as the value of a variable named VARIABLE.<br><br>Useful if you have $ sign in your value and there are some characters after it, but you would not like to interpolate it from another value. In this case, you should set this to true."
+                                                    label="Is Literal?" />
                                             @endif
                                         @endif
                                     @endif
@@ -129,8 +127,8 @@
                         @if (!$is_redis_credential)
                             @if ($type === 'service')
                                 <x-forms.checkbox disabled id="is_buildtime"
-                                helper="Make this variable available during Docker build process. Useful for build secrets and dependencies."
-                                label="Available at Buildtime" />
+                                    helper="Make this variable available during Docker build process. Useful for build secrets and dependencies."
+                                    label="Available at Buildtime" />
                                 <x-forms.checkbox disabled id="is_runtime"
                                     helper="Make this variable available in the running container at runtime."
                                     label="Available at Runtime" />