From a88a0161375c2463b15e5235489d115bfd56a84b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 15 Oct 2023 16:54:16 +0200
Subject: [PATCH] fix: build image before starting dockerfile buildpacks

---
 app/Jobs/ApplicationDeploymentJob.php | 16 ++++++++--------
 config/sentry.php                     |  2 +-
 config/version.php                    |  2 +-
 versions.json                         |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index f8197d41d..3b9c74b90 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -298,7 +298,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_compose_file();
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
-        // $this->build_image();
+        $this->build_image();
         $this->rolling_update();
     }
     private function deploy_nixpacks_buildpack()
@@ -668,12 +668,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }
-        if ($this->build_pack === 'dockerfile') {
-            $docker_compose['services'][$this->container_name]['build'] = [
-                'context' => $this->workdir,
-                'dockerfile' => $this->workdir . $this->dockerfile_location,
-            ];
-        }
+        // if ($this->build_pack === 'dockerfile') {
+        //     $docker_compose['services'][$this->container_name]['build'] = [
+        //         'context' => $this->workdir,
+        //         'dockerfile' => $this->workdir . $this->dockerfile_location,
+        //     ];
+        // }
         $this->docker_compose = Yaml::dump($docker_compose, 10);
         $this->docker_compose_base64 = base64_encode($this->docker_compose);
         $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}/docker-compose.yml"), "hidden" => true]);
@@ -804,7 +804,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             );
         } else {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
diff --git a/config/sentry.php b/config/sentry.php
index fd7d35889..9631be2fd 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.85',
+    'release' => '4.0.0-beta.86',
     // 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 4076867dc..86fe50176 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.85';
+return '4.0.0-beta.86';
diff --git a/versions.json b/versions.json
index ab04cce68..830ae81a4 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.85"
+            "version": "4.0.0-beta.86"
         }
     }
 }