Merge pull request #1598 from coollabsio/next

v4.0.0-beta.180

README.md

@@ -23,28 +23,7 @@ Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and
 <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">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60px" height="60px"
-	 viewBox="0 0 290 250" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#116DFF;}
-</style>
-	<g>
-		<path class="st1" d="M158.6,96.4c0.4,2.3,2.9,3.7,5.1,2.9L206.9,84c19.8-7.1,31.6-27.5,27.8-48.2l0,0c-4.8-26-31.7-41.5-56.6-32.7
-			l0,0c-19.8,7.1-31.6,27.5-27.8,48.2L158.6,96.4z"/>
-		<path class="st1" d="M269.1,95.4L269.1,95.4c-16-13.7-39.6-13.7-55.7,0l-34.9,29.7c-1.8,1.5-1.8,4.3,0,5.9l34.9,29.7
-			c16,13.7,39.6,13.7,55.7,0l0,0C289.3,143.7,289.3,112.6,269.1,95.4z"/>
-		<path class="st1" d="M206.9,172.2l-43.2-15.4c-2.2-0.8-4.7,0.6-5.1,2.9l-8.3,45.1c-3.8,20.7,8,41.1,27.8,48.2l0,0
-			c24.9,8.9,51.8-6.7,56.6-32.7l0,0C238.5,199.7,226.7,179.3,206.9,172.2z"/>
-		<path class="st1" d="M128.8,159.8c-0.4-2.3-2.9-3.7-5.1-2.9l-43.2,15.4c-19.8,7.1-31.6,27.5-27.8,48.2l0,0
-			c4.8,26,31.7,41.5,56.6,32.7l0,0c19.8-7.1,31.6-27.5,27.8-48.2L128.8,159.8z"/>
-		<path class="st1" d="M108.8,131.1c1.8-1.5,1.8-4.3,0-5.9L73.9,95.4c-16-13.7-39.6-13.7-55.7,0l0,0c-20.1,17.1-20.1,48.2,0,65.4
-			l0,0c16,13.7,39.6,13.7,55.7,0L108.8,131.1z"/>
-		<path class="st1" d="M80.5,84l43.2,15.4c2.2,0.8,4.7-0.6,5.1-2.9l8.3-45.1c3.8-20.7-8-41.1-27.8-48.2l0,0
-			C84.3-5.7,57.4,9.8,52.6,35.8l0,0C48.8,56.5,60.6,76.9,80.5,84z"/>
-	</g>
-</svg></a>
+<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>

app/Actions/Service/DeleteService.php

@@ -21,14 +21,14 @@ class DeleteService
             foreach ($storages as $storage) {
                 $storagesToDelete->push($storage);
             }
-            $application->delete();
+            $application->forceDelete();
         }
         foreach ($service->databases()->get() as $database) {
             $storages = $database->persistentStorages()->get();
             foreach ($storages as $storage) {
                 $storagesToDelete->push($storage);
             }
-            $database->delete();
+            $database->forceDelete();
         }
         foreach ($storagesToDelete as $storage) {
             $commands[] = "docker volume rm -f $storage->name";

app/Console/Commands/Init.php

@@ -55,7 +55,8 @@ class Init extends Command
             }
         }
     }
-    private function restore_coolify_db_backup() {
+    private function restore_coolify_db_backup()
+    {
         try {
             $database = StandalonePostgresql::withTrashed()->find(0);
             if ($database && $database->trashed()) {
@@ -73,9 +74,8 @@ class Init extends Command
                         'team_id' => 0,
                     ]);
                 }
-
             }
-        } catch(\Throwable $e) {
+        } catch (\Throwable $e) {
             echo "Error in restoring coolify db backup: {$e->getMessage()}\n";
         }
     }
@@ -138,6 +138,89 @@ class Init extends Command
     }
     private function cleanup_stucked_resources()
     {
+
+        try {
+            $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($applications as $application) {
+                echo "Deleting stucked application: {$application->name}\n";
+                $application->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked application: {$e->getMessage()}\n";
+        }
+        try {
+            $postgresqls = StandalonePostgresql::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($postgresqls as $postgresql) {
+                echo "Deleting stucked postgresql: {$postgresql->name}\n";
+                $postgresql->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked postgresql: {$e->getMessage()}\n";
+        }
+        try {
+            $redis = StandaloneRedis::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($redis as $redis) {
+                echo "Deleting stucked redis: {$redis->name}\n";
+                $redis->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked redis: {$e->getMessage()}\n";
+        }
+        try {
+            $mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($mongodbs as $mongodb) {
+                echo "Deleting stucked mongodb: {$mongodb->name}\n";
+                $mongodb->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked mongodb: {$e->getMessage()}\n";
+        }
+        try {
+            $mysqls = StandaloneMysql::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($mysqls as $mysql) {
+                echo "Deleting stucked mysql: {$mysql->name}\n";
+                $mysql->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked mysql: {$e->getMessage()}\n";
+        }
+        try {
+            $mariadbs = StandaloneMariadb::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($mariadbs as $mariadb) {
+                echo "Deleting stucked mariadb: {$mariadb->name}\n";
+                $mariadb->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked mariadb: {$e->getMessage()}\n";
+        }
+        try {
+            $services = Service::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($services as $service) {
+                echo "Deleting stucked service: {$service->name}\n";
+                $service->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked service: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceApps = ServiceApplication::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($serviceApps as $serviceApp) {
+                echo "Deleting stucked serviceapp: {$serviceApp->name}\n";
+                $serviceApp->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked serviceapp: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceDbs = ServiceDatabase::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($serviceDbs as $serviceDb) {
+                echo "Deleting stucked serviceapp: {$serviceDb->name}\n";
+                $serviceDb->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked serviceapp: {$e->getMessage()}\n";
+        }
+
         // Cleanup any resources that are not attached to any environment or destination or server
         try {
             $applications = Application::all();

app/Jobs/ApplicationDeploymentJob.php

@@ -81,6 +81,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private ?string $buildTarget = null;
     private Collection $saved_outputs;
     private ?string $full_healthcheck_url = null;
+    private ?string $nixpacks_command = null;
 
     private string $serverUser = 'root';
     private string $serverUserHomeDir = '/root';
@@ -879,7 +880,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $cacheKey = "{$this->application->uuid}-pr-{$this->pull_request_id}";
         }
-        $nixpacks_command = "nixpacks build --cache-key '{$cacheKey}' -o {$this->workdir} {$this->env_args} --no-error-without-start";
+        if ($this->force_rebuild) {
+            $nixpacks_command = "nixpacks build --no-cache {$this->env_args} --no-error-without-start";
+        } else {
+            $nixpacks_command = "nixpacks build --cache-key '{$cacheKey}' {$this->env_args} --no-error-without-start";
+        }
         if ($this->application->build_command) {
             $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
         }
@@ -889,7 +894,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->application->install_command) {
             $nixpacks_command .= " --install-cmd \"{$this->application->install_command}\"";
         }
-        $nixpacks_command .= " {$this->workdir}";
+        $this->nixpacks_command = $nixpacks_command;
+        $nixpacks_command .= " -o {$this->workdir} {$this->workdir}";
         return $nixpacks_command;
     }
 
@@ -1133,7 +1139,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         // Add PORT if not exists, use the first port as default
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
             $environment_variables->push("PORT={$ports[0]}");
-        }  if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('SOURCE_COMMIT'))->isEmpty()) {
+        }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('SOURCE_COMMIT'))->isEmpty()) {
             if (!is_null($this->commit)) {
                 $environment_variables->push("SOURCE_COMMIT={$this->commit}");
             }
@@ -1196,6 +1203,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->application->settings->is_static || $this->application->build_pack === 'static') {
             if ($this->application->static_image) {
                 $this->pull_latest_image($this->application->static_image);
+                $this->execute_remote_command(
+                    ["echo -n 'Continue with the building process.'"],
+                );
             }
             if ($this->application->build_pack === 'static') {
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -1222,9 +1232,26 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 }
             }");
             } else {
-                $this->execute_remote_command([
-                    executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
-                ]);
+                if ($this->application->build_pack === 'nixpacks') {
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "mv {$this->workdir}/Dockerfile {$this->workdir}/.nixpacks/Dockerfile")
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, $this->nixpacks_command . " --name $this->build_image_name {$this->workdir}"), "hidden" => true
+                        ]
+                    );
+                } else {
+                    if ($this->force_rebuild) {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "docker build --no-cache $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                        ]);
+                    } else {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                        ]);
+                    }
+                }
 
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
 WORKDIR /usr/share/nginx/html/
@@ -1267,9 +1294,27 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]);
             } else {
-                $this->execute_remote_command([
-                    executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
-                ]);
+
+                if ($this->application->build_pack === 'nixpacks') {
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "mv {$this->workdir}/Dockerfile {$this->workdir}/.nixpacks/Dockerfile")
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, $this->nixpacks_command . " --name {$this->production_image_name} {$this->workdir}"), "hidden" => true
+                        ]
+                    );
+                } else {
+                    if ($this->force_rebuild) {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "docker build --no-cache $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                        ]);
+                    } else {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                        ]);
+                    }
+                }
             }
         }
         $this->execute_remote_command([
@@ -1295,6 +1340,9 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             });
         } else {
             $this->application_deployment_queue->addLogEntry("New container is not healthy, rolling back to the old container.");
+            $this->application_deployment_queue->update([
+                'status' => ApplicationDeploymentStatus::FAILED->value,
+            ]);
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
             );

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',

app/Models/Application.php

@@ -425,7 +425,7 @@ class Application extends BaseModel
     public function isConfigurationChanged($save = false)
     {
         $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->health_check_path  . $this->health_check_port . $this->health_check_host . $this->health_check_method . $this->health_check_return_code . $this->health_check_scheme . $this->health_check_response_text . $this->health_check_interval . $this->health_check_timeout . $this->health_check_retries . $this->health_check_start_period . $this->health_check_enabled . $this->limits_memory  . $this->limits_swap . $this->limits_swappiness . $this->limits_reservation . $this->limits_cpus . $this->limits_cpuset . $this->limits_cpu_shares . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
-        if ($this->pull_request_id === 0) {
+        if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
             $newConfigHash .= json_encode($this->environment_variables->all());
         } else {
             $newConfigHash .= json_encode($this->environment_variables_preview->all());

bootstrap/helpers/shared.php

@@ -1035,7 +1035,9 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 }
                 data_set($service, 'labels', $serviceLabels->toArray());
                 data_forget($service, 'is_database');
-                data_set($service, 'restart', RESTART_MODE);
+                if (!data_get($service, 'restart')) {
+                    data_set($service, 'restart', RESTART_MODE);
+                }
                 data_set($service, 'container_name', $containerName);
                 data_forget($service, 'volumes.*.content');
                 data_forget($service, 'volumes.*.isDirectory');
@@ -1473,7 +1475,9 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             }
             data_set($service, 'labels', $serviceLabels->toArray());
             data_forget($service, 'is_database');
-            data_set($service, 'restart', RESTART_MODE);
+            if (!data_get($service, 'restart')) {
+                data_set($service, 'restart', RESTART_MODE);
+            }
             data_set($service, 'container_name', $containerName);
             data_forget($service, 'volumes.*.content');
             data_forget($service, 'volumes.*.isDirectory');

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.180',
     // 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.177';
+return '4.0.0-beta.180';

docker/coolify-helper/Dockerfile

@@ -8,9 +8,9 @@ ARG DOCKER_COMPOSE_VERSION=2.21.0
 # https://github.com/docker/buildx/releases
 ARG DOCKER_BUILDX_VERSION=0.11.2
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=0.31.0
+ARG PACK_VERSION=0.32.1
 # https://github.com/railwayapp/nixpacks/releases
-ARG NIXPACKS_VERSION=1.18.0
+ARG NIXPACKS_VERSION=1.20.0
 
 USER root
 WORKDIR /artifacts

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

@@ -50,7 +50,7 @@
                     @if ($application->build_pack === 'dockercompose')
                         <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.<br><br>So if you are using Traefik, you need to set the correct labels and everything." />
+                            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')))
@@ -189,7 +189,7 @@
                 <x-forms.button wire:click="loadComposeFile">Reload Compose File</x-forms.button>
                 @if ($application->settings->is_raw_compose_deployment_enabled)
                     <x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
-                        label="Docker Compose Content" helper="You need to modify the docker compose file." />
+                        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." />

versions.json

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