Merge pull request #1605 from coollabsio/next

v4.0.0-beta.183

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

@@ -164,11 +164,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $ips = collect([]);
             if (count($allContainers) > 0) {
                 $allContainers = $allContainers[0];
+                $allContainers = collect($allContainers)->sort()->values();
                 foreach ($allContainers as $container) {
                     $containerName = data_get($container, 'Name');
                     if ($containerName === 'coolify-proxy') {
                         continue;
                     }
+                    if (preg_match('/-(\d{12})/',$containerName)) {
+                        continue;
+                    }
                     $containerIp = data_get($container, 'IPv4Address');
                     if ($containerName && $containerIp) {
                         $containerIp = str($containerIp)->before('/');
@@ -875,11 +879,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function nixpacks_build_cmd()
     {
         $this->generate_env_variables();
-        $cacheKey = $this->application->uuid;
-        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";
+        // $cacheKey = $this->application->uuid;
+        // if ($this->pull_request_id !== 0) {
+            // $cacheKey = "{$this->application->uuid}-pr-{$this->pull_request_id}";
+        // }
+        $nixpacks_command = "nixpacks build {$this->env_args} --no-error-without-start";
         if ($this->application->build_command) {
             $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
         }
@@ -889,7 +893,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->application->install_command) {
             $nixpacks_command .= " --install-cmd \"{$this->application->install_command}\"";
         }
-        $nixpacks_command .= " {$this->workdir}";
+        $nixpacks_command .= " -o {$this->workdir} {$this->workdir}";
         return $nixpacks_command;
     }
 
@@ -1133,7 +1137,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 +1201,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 +1230,23 @@ 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, "cp {$this->workdir}/Dockerfile {$this->workdir}/.nixpacks/Dockerfile")
+                        ],
+                    );
+                }
+                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 +1289,23 @@ 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, "cp {$this->workdir}/Dockerfile {$this->workdir}/.nixpacks/Dockerfile")
+                        ],
+                    );
+                }
+
+                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 +1331,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/Shared/EnvironmentVariable/All.php

@@ -139,6 +139,18 @@ class All extends Component
                 case 'standalone-postgresql':
                     $environment->standalone_postgresql_id = $this->resource->id;
                     break;
+                case 'standalone-redis':
+                    $environment->standalone_redis_id = $this->resource->id;
+                    break;
+                case 'standalone-mongodb':
+                    $environment->standalone_mongodb_id = $this->resource->id;
+                    break;
+                case 'standalone-mysql':
+                    $environment->standalone_mysql_id = $this->resource->id;
+                    break;
+                case 'standalone-mariadb':
+                    $environment->standalone_mariadb_id = $this->resource->id;
+                    break;
                 case 'service':
                     $environment->service_id = $this->resource->id;
                     break;

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/proxy.php

@@ -101,12 +101,27 @@ function generate_default_proxy_configuration(Server $server)
     $labels = [
         "traefik.enable=true",
         "traefik.http.routers.traefik.entrypoints=http",
-        "traefik.http.routers.traefik.middlewares=traefik-basic-auth@file",
         "traefik.http.routers.traefik.service=api@internal",
         "traefik.http.services.traefik.loadbalancer.server.port=8080",
         // Global Middlewares
         "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https",
         "traefik.http.middlewares.gzip.compress=true",
+        // https WWW to non-WWW
+        "traefik.http.middlewares.https-www-to-non-www.redirectregex.regex=^https?://www\\.(.+)",
+        "traefik.http.middlewares.https-www-to-non-www.redirectregex.replacement=https://\$1",
+        "traefik.http.middlewares.https-www-to-non-www.redirectregex.permanent=true",
+        // https Non-WWW to WWW
+        "traefik.http.middlewares.https-non-www-to-www.redirectregex.regex=^https?://(?:www\\.)?(.+)",
+        "traefik.http.middlewares.https-non-www-to-www.redirectregex.replacement=https://www.\$\${1}",
+        "traefik.http.middlewares.https-non-www-to-www.redirectregex.permanent=true",
+        // http www to non-WWW
+        "traefik.http.middlewares.http-www-to-non-www.redirectregex.regex=^http://www\\.(.+)",
+        "traefik.http.middlewares.http-www-to-non-www.redirectregex.replacement=http://\$1",
+        "traefik.http.middlewares.http-www-to-non-www.redirectregex.permanent=true",
+        // http Non-WWW to WWW
+        "traefik.http.middlewares.http-non-www-to-www.redirectregex.regex=^http://(?:www\\.)?(.+)",
+        "traefik.http.middlewares.http-non-www-to-www.redirectregex.replacement=http://www.\$\${1}",
+        "traefik.http.middlewares.http-non-www-to-www.redirectregex.permanent=true",
     ];
     $config = [
         "version" => "3.8",

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.178',
+    'release' => '4.0.0-beta.183',
     // 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.178';
+return '4.0.0-beta.183';

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/components/collapsible.blade.php

@@ -1,12 +0,0 @@
-@isset($title, $action)
-    <div tabindex="0" x-data="{ open: false }"
-        class="transition border rounded cursor-pointer collapse collapse-arrow border-coolgray-200"
-        :class="open ? 'collapse-open' : 'collapse-close'">
-        <div class="flex flex-col justify-center text-sm select-text collapse-title" x-on:click="open = !open">
-            {{ $title }}
-        </div>
-        <div class="collapse-content">
-            {{ $action }}
-        </div>
-    </div>
-@endisset

resources/views/livewire/project/service/file-storage.blade.php

@@ -1,8 +1,10 @@
-<x-collapsible>
-    <x-slot:title>
+<div tabindex="0" x-data="{ open: false }"
+    class="transition border rounded cursor-pointer collapse collapse-arrow border-coolgray-200"
+    :class="open ? 'collapse-open' : 'collapse-close'">
+    <div class="flex flex-col justify-center text-sm select-text collapse-title" x-on:click="open = !open">
         <div>{{ $workdir }}{{ $fs_path }} -> {{ $fileStorage->mount_path }}</div>
-    </x-slot:title>
-    <x-slot:action>
+    </div>
+    <div class="collapse-content">
         <form wire:submit='submit' class="flex flex-col gap-2">
             <div class="w-64">
                 <x-forms.checkbox instantSave label="Is directory?" id="fileStorage.is_directory"></x-forms.checkbox>
@@ -21,5 +23,5 @@
             @endif
             {{-- @endif --}}
         </form>
-    </x-slot:action>
-</x-collapsible>
+    </div>
+</div>

templates/compose/stirling-pdf.yaml

@@ -0,0 +1,15 @@
+# documentation: https://github.com/Stirling-Tools/Stirling-PDF
+# slogan: Stirling is a powerful web based PDF manipulation tool
+# tags: pdf, manipulation, web, tool
+
+services:
+  stirling-pdf:
+    image: frooodle/s-pdf:latest
+    volumes:
+      - stirling-training-data:/usr/share/tesseract-ocr/5/tessdata
+      - stirling-configs:/configs
+      - stirling-custom-files:/customFiles/
+      - stirling-logs:/logs/
+    environment:
+      - SERVICE_FQDN_SPDF
+      - DOCKER_ENABLE_SECURITY=false

templates/service-templates.json

@@ -469,6 +469,17 @@
             "internet"
         ]
     },
+    "stirling-pdf": {
+        "documentation": "https:\/\/github.com\/Stirling-Tools\/Stirling-PDF",
+        "slogan": "Stirling is a powerful web based PDF manipulation tool",
+        "compose": "c2VydmljZXM6CiAgc3RpcmxpbmctcGRmOgogICAgaW1hZ2U6ICdmcm9vb2RsZS9zLXBkZjpsYXRlc3QnCiAgICB2b2x1bWVzOgogICAgICAtICdzdGlybGluZy10cmFpbmluZy1kYXRhOi91c3Ivc2hhcmUvdGVzc2VyYWN0LW9jci81L3Rlc3NkYXRhJwogICAgICAtICdzdGlybGluZy1jb25maWdzOi9jb25maWdzJwogICAgICAtICdzdGlybGluZy1jdXN0b20tZmlsZXM6L2N1c3RvbUZpbGVzLycKICAgICAgLSAnc3RpcmxpbmctbG9nczovbG9ncy8nCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fU1BERgogICAgICAtIERPQ0tFUl9FTkFCTEVfU0VDVVJJVFk9ZmFsc2UK",
+        "tags": [
+            "pdf",
+            "manipulation",
+            "web",
+            "tool"
+        ]
+    },
     "trigger-with-external-database": {
         "documentation": "https:\/\/trigger.dev\/docs\/documentation\/guides\/self-hosting",
         "slogan": "The open source Background Jobs framework for TypeScript",

versions.json

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