Merge pull request #5616 from coollabsio/next

v4.0.0-beta.409

bootstrap/helpers/shared.php

@@ -3206,6 +3206,15 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
         $use_network_mode = data_get($service, 'network_mode') !== null;
         $depends_on = collect(data_get($service, 'depends_on', []));
         $labels = collect(data_get($service, 'labels', []));
+        if ($labels->count() > 0) {
+            if (isAssociativeArray($labels)) {
+                $newLabels = collect([]);
+                $labels->each(function ($value, $key) use ($newLabels) {
+                    $newLabels->push("$key=$value");
+                });
+                $labels = $newLabels;
+            }
+        }
         $environment = collect(data_get($service, 'environment', []));
         $ports = collect(data_get($service, 'ports', []));
         $buildArgs = collect(data_get($service, 'build.args', []));
@@ -3819,6 +3828,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
             return $volume;
         });
 
+        ray($serviceLabels);
         $payload = collect($service)->merge([
             'container_name' => $containerName,
             'restart' => $restart->value(),

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.408',
+        'version' => '4.0.0-beta.409',
         'helper_version' => '1.0.8',
         'realtime_version' => '1.0.7',
         'self_hosted' => env('SELF_HOSTED', true),

other/nightly/versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.408"
+            "version": "4.0.0-beta.409"
         },
         "nightly": {
             "version": "4.0.0-beta.410"

resources/views/livewire/project/application/source.blade.php

@@ -26,9 +26,11 @@
         <div class="pb-4">Code source of your application.</div>
 
         <div class="flex flex-col gap-2">
-            <div>Currently connected source: <span
+            @if (!$privateKeyId)
-                    class="font-bold text-warning">{{ $application->source->name }}</span>
+                <div>Currently connected source: <span
-            </div>
+                        class="font-bold text-warning">{{ data_get($application, 'source.name', 'No source connected') }}</span>
+                </div>
+            @endif
             <div class="flex gap-2">
                 <x-forms.input placeholder="coollabsio/coolify-example" id="gitRepository" label="Repository" />
                 <x-forms.input placeholder="main" id="gitBranch" label="Branch" />
@@ -38,38 +40,6 @@
             </div>
         </div>
 
-        <div class="pt-4">
-            <h3 class="pb-2">Change Git Source</h3>
-            <div class="grid grid-cols-1 gap-2">
-                @forelse ($sources as $source)
-                    <div wire:key="{{ $source->name }}">
-                        <x-modal-confirmation title="Change Git Source" :actions="['Change git source to ' . $source->name]" :buttonFullWidth="true"
-                            :isHighlightedButton="$application->source_id === $source->id" :disabled="$application->source_id === $source->id"
-                            submitAction="changeSource({{ $source->id }}, {{ $source->getMorphClass() }})"
-                            :confirmWithText="true" confirmationText="Change Git Source"
-                            confirmationLabel="Please confirm changing the git source by entering the text below"
-                            shortConfirmationLabel="Confirmation Text" :confirmWithPassword="false">
-                            <x-slot:customButton>
-                                <div class="flex items-center gap-2">
-                                    <div class="box-title">
-                                        {{ $source->name }}
-                                        @if ($application->source_id === $source->id)
-                                            <span class="text-xs">(current)</span>
-                                        @endif
-                                    </div>
-                                    <div class="box-description">
-                                        {{ $source->organization ?? 'Personal Account' }}
-                                    </div>
-                                </div>
-                            </x-slot:customButton>
-                        </x-modal-confirmation>
-                    </div>
-                @empty
-                    <div class="text-center">No sources found</div>
-                @endforelse
-            </div>
-        </div>
-
         @if ($privateKeyId)
             <h3 class="pt-4">Deploy Key</h3>
             <div class="py-2 pt-4">Currently attached Private Key: <span
@@ -83,6 +53,38 @@
                     </x-forms.button>
                 @endforeach
             </div>
+        @else
+            <div class="pt-4">
+                <h3 class="pb-2">Change Git Source</h3>
+                <div class="grid grid-cols-1 gap-2">
+                    @forelse ($sources as $source)
+                        <div wire:key="{{ $source->name }}">
+                            <x-modal-confirmation title="Change Git Source" :actions="['Change git source to ' . $source->name]" :buttonFullWidth="true"
+                                :isHighlightedButton="$application->source_id === $source->id" :disabled="$application->source_id === $source->id"
+                                submitAction="changeSource({{ $source->id }}, {{ $source->getMorphClass() }})"
+                                :confirmWithText="true" confirmationText="Change Git Source"
+                                confirmationLabel="Please confirm changing the git source by entering the text below"
+                                shortConfirmationLabel="Confirmation Text" :confirmWithPassword="false">
+                                <x-slot:customButton>
+                                    <div class="flex items-center gap-2">
+                                        <div class="box-title">
+                                            {{ $source->name }}
+                                            @if ($application->source_id === $source->id)
+                                                <span class="text-xs">(current)</span>
+                                            @endif
+                                        </div>
+                                        <div class="box-description">
+                                            {{ $source->organization ?? 'Personal Account' }}
+                                        </div>
+                                    </div>
+                                </x-slot:customButton>
+                            </x-modal-confirmation>
+                        </div>
+                    @empty
+                        <div class="text-center">No sources found</div>
+                    @endforelse
+                </div>
+            </div>
         @endif
     </form>
 </div>

resources/views/livewire/project/database/redis/general.blade.php

@@ -13,22 +13,41 @@
                 helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/redis'>https://hub.docker.com/_/redis</a>" />
         </div>
         <div class="flex flex-col gap-2">
-            @if (version_compare($redis_version, '6.0', '>='))
+            @if ($database->started_at)
-                <x-forms.input label="Username" id="redis_username" required
+                <div class="pt-2 dark:text-warning">If you change the values in the database, please sync it here,
-                    helper="You can change the Redis Username in the input field below or by editing the value of the REDIS_USERNAME environment variable.
+                    otherwise
+                    automations won't work. <br>Changing them here will not change the values in the database.
+                </div>
+                <div class="flex gap-2">
+                    @if (version_compare($redis_version, '6.0', '>='))
+                        <x-forms.input label="Username" id="redis_username"
+                            helper="You can only change this in the database." />
+                    @endif
+                    <x-forms.input label="Password" id="redis_password" type="password"
+                        helper="You can only change this in the database." />
+                </div>
+            @else
+                <div class="pt-2 dark:text-warning">You can only change the username and password in the database after
+                    initial start.</div>
+                <div class="flex gap-2">
+                    @if (version_compare($redis_version, '6.0', '>='))
+                        <x-forms.input label="Username" id="redis_username" required
+                            helper="You can change the Redis Username in the input field below or by editing the value of the REDIS_USERNAME environment variable.
                     <br><br>
                     If you change the Redis Username in the database, please sync it here, otherwise automations (like backups) won't work.
                     <br><br>
                     Note: If the environment variable REDIS_USERNAME is set as a shared variable (environment, project, or team-based), this input field will become read-only."
-                    :disabled="$this->isSharedVariable('REDIS_USERNAME')" />
+                            :disabled="$this->isSharedVariable('REDIS_USERNAME')" />
-            @endif
+                    @endif
-            <x-forms.input label="Password" id="redis_password" type="password" required
+                    <x-forms.input label="Password" id="redis_password" type="password" required
-                helper="You can change the Redis Password in the input field below or by editing the value of the REDIS_PASSWORD environment variable.
+                        helper="You can change the Redis Password in the input field below or by editing the value of the REDIS_PASSWORD environment variable.
                 <br><br>
                 If you change the Redis Password in the database, please sync it here, otherwise automations (like backups) won't work.
                 <br><br>
                 Note: If the environment variable REDIS_PASSWORD is set as a shared variable (environment, project, or team-based), this input field will become read-only."
-                :disabled="$this->isSharedVariable('REDIS_PASSWORD')" />
+                        :disabled="$this->isSharedVariable('REDIS_PASSWORD')" />
+                </div>
+            @endif
         </div>
         <x-forms.input
             helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.408"
+            "version": "4.0.0-beta.409"
         },
         "nightly": {
             "version": "4.0.0-beta.410"