Merge pull request #1596 from coollabsio/next

v4.0.0-beta.178

README.md

@@ -19,10 +19,12 @@ Thank you so much!
 
 Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and [Appwrite](https://appwrite.io)!
 
-<a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="appwrite logo" width="200"/></a>
+<a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="cccareers logo" width="200"/></a>
 <a href="https://appwrite.io" target="_blank"><img src="./other/logos/appwrite.svg" alt="appwrite logo" width="200"/></a>
 
 ## Github Sponsors ($15+)
+<a href="https://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></a>
+<a href="https://github.com/automazeio"><img src="https://github.com/automazeio.png" width="60px" alt="Corentin Clichy" /></a>
 <a href="https://github.com/corentinclichy"><img src="https://github.com/corentinclichy.png" width="60px" alt="Corentin Clichy" /></a>
 <a href="https://github.com/Niki2k1"><img src="https://github.com/Niki2k1.png" width="60px" alt="Niklas Lausch" /></a>
 <a href="https://github.com/pixelinfinito"><img src="https://github.com/pixelinfinito.png" width="60px" alt="Pixel Infinito" /></a>
@@ -32,7 +34,6 @@ Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and
 <a href="https://github.com/Illyism"><img src="https://github.com/Illyism.png" width="60px" alt="Ilias Ism" /></a>
 <a href="https://github.com/urtho"><img src="https://github.com/urtho.png" width="60px" alt="Paweł Pierścionek" /></a>
 <a href="https://github.com/monocursive"><img src="https://github.com/monocursive.png" width="60px" alt="Michael Mazurczak" /></a>
-<a href="https://github.com/cccareers"><img src="https://github.com/cccareers.png" width="60px" alt="Creating Coding Careers" /></a>
 
 ## Organizations
 <a href="https://opencollective.com/coollabsio/organization/0/website"><img src="https://opencollective.com/coollabsio/organization/0/avatar.svg"></a>

app/Jobs/ApplicationDeploymentJob.php

@@ -446,8 +446,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_image_names();
         $this->cleanup_git();
         $this->application->loadComposeFile(isInit: false);
-        $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
-        $yaml = Yaml::dump($composeFile->toArray(), 10);
+            $yaml = $composeFile = $this->application->docker_compose_raw;
+        } else {
+            $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
+            $yaml = Yaml::dump($composeFile->toArray(), 10);
+        }
         $this->docker_compose_base64 = base64_encode($yaml);
         $this->execute_remote_command([
             executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}{$this->docker_compose_location}"), "hidden" => true

app/Livewire/Project/Application/General.php

@@ -66,6 +66,7 @@ class General extends Component
         'application.settings.is_static' => 'boolean|required',
         'application.docker_compose_custom_start_command' => 'nullable',
         'application.docker_compose_custom_build_command' => 'nullable',
+        'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -98,6 +99,7 @@ class General extends Component
         'application.settings.is_static' => 'Is static',
         'application.docker_compose_custom_start_command' => 'Docker compose custom start command',
         'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
+        'application.settings.is_raw_compose_deployment_enabled' => 'Is raw compose deployment enabled',
     ];
     public function mount()
     {
@@ -114,6 +116,11 @@ class General extends Component
         }
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         $this->customLabels = $this->application->parseContainerLabels();
+        if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+            $this->application->custom_labels = base64_encode($this->customLabels);
+            $this->application->save();
+        }
         $this->initialDockerComposeLocation = $this->application->docker_compose_location;
         $this->checkLabelUpdates();
     }
@@ -199,7 +206,12 @@ class General extends Component
     public function submit($showToaster = true)
     {
         try {
-            ray($this->initialDockerComposeLocation, $this->application->docker_compose_location);
+            if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+                $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+                $this->application->custom_labels = base64_encode($this->customLabels);
+                $this->application->save();
+            }
+
             if ($this->application->build_pack === 'dockercompose' && $this->initialDockerComposeLocation !== $this->application->docker_compose_location) {
                 $this->loadComposeFile();
             }
@@ -207,6 +219,7 @@ class General extends Component
             if ($this->ports_exposes !== $this->application->ports_exposes) {
                 $this->resetDefaultLabels(false);
             }
+
             if (data_get($this->application, 'build_pack') === 'dockerimage') {
                 $this->validate([
                     'application.docker_registry_image_name' => 'required',

bootstrap/helpers/shared.php

@@ -1399,6 +1399,11 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             $key = $value;
                             $defaultValue = null;
                         }
+                        $foundEnv = EnvironmentVariable::where([
+                            'key' => $key,
+                            'application_id' => $resource->id,
+                            'is_preview' => false,
+                        ])->first();
                         if ($foundEnv) {
                             $defaultValue = data_get($foundEnv, 'value');
                         }

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.176',
+    'release' => '4.0.0-beta.178',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.176';
+return '4.0.0-beta.178';

database/migrations/2024_01_02_113855_add_raw_compose_deployment.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->boolean('is_raw_compose_deployment_enabled')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('is_raw_compose_deployment_enabled');
+        });
+    }
+};

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

@@ -5,9 +5,10 @@
         </div>
         <div>Advanced configuration for your application.</div>
         <div class="flex flex-col w-full pt-4">
-
+            @if (!$application->settings->is_raw_compose_deployment_enabled)
-            <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
-                instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
+                    instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
+            @endif
             <x-forms.checkbox
                 helper="Your application will be available only on https if your domain starts with https://..."
                 instantSave id="application.settings.is_force_https_enabled" label="Force Https" />

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

@@ -48,7 +48,10 @@
                         </div>
                     @endif
                     @if ($application->build_pack === 'dockercompose')
-                        @if (count($parsedServices) > 0)
+                        <x-forms.checkbox instantSave id="application.settings.is_raw_compose_deployment_enabled"
+                            label="Raw Compose Deployment"
+                            helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a href='https://coolify.io/docs/docker-compose'>documentation.</a>" />
+                        @if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))
                                     <div class="flex items-end gap-2">
@@ -184,8 +187,13 @@
             @endif
             @if ($application->build_pack === 'dockercompose')
                 <x-forms.button wire:click="loadComposeFile">Reload Compose File</x-forms.button>
-                <x-forms.textarea rows="10" readonly id="application.docker_compose"
+                @if ($application->settings->is_raw_compose_deployment_enabled)
-                    label="Docker Compose Content" helper="You need to modify the docker compose file." />
+                    <x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
+                        label="Docker Compose Content (applicationId: {{$application->id}})" helper="You need to modify the docker compose file." />
+                @else
+                    <x-forms.textarea rows="10" readonly id="application.docker_compose"
+                        label="Docker Compose Content" helper="You need to modify the docker compose file." />
+                @endif
                 {{-- <x-forms.textarea rows="10" readonly id="application.docker_compose_pr"
                     label="Docker PR Compose Content" helper="You need to modify the docker compose file." /> --}}
             @endif

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.176"
+            "version": "4.0.0-beta.178"
         }
     }
 }