diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php index 6b2f07dc3..f54a46e09 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -116,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(); } @@ -201,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(); } @@ -209,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', diff --git a/config/sentry.php b/config/sentry.php index 84bd36a64..9296ac156 100644 --- a/config/sentry.php +++ b/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.177', + 'release' => '4.0.0-beta.178', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 2fa0950f8..661773b8d 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ build_pack === 'dockercompose') + 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 documentation." /> @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'))) @@ -189,7 +189,7 @@ Reload Compose File @if ($application->settings->is_raw_compose_deployment_enabled) + label="Docker Compose Content (applicationId: {{$application->id}})" helper="You need to modify the docker compose file." /> @else diff --git a/versions.json b/versions.json index 943f4c9ae..cbface749 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.36" }, "v4": { - "version": "4.0.0-beta.177" + "version": "4.0.0-beta.178" } } }