fix: nixpacks cache

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 @@ private function nixpacks_build_cmd()
         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 @@ private function nixpacks_build_cmd()
         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 @@ private function generate_environment_variables($ports)
         // 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 @@ private function build_image()
         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}
@@ -1221,10 +1231,27 @@ private function build_image()
                     root   /usr/share/nginx/html;
                 }
             }");
+            } else {
+                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,11 +1294,29 @@ private function build_image()
                     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 {
+
+                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([
             "echo -n 'Building docker image completed.'",
         ]);

app/Models/Application.php

@@ -425,7 +425,7 @@ public function isLogDrainEnabled()
     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());

config/sentry.php

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

versions.json

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