From 61a7b9ac94be8e3588f55b454bee189f47a261ed Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 7 Oct 2023 12:54:19 +0200
Subject: [PATCH] fix: able to set base dir for Dockerfile build pack

---
 app/Jobs/ApplicationDeploymentJob.php             | 13 ++++++++++---
 .../project/application/general.blade.php         | 15 +++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index fc0387357..cfccb6912 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -254,7 +254,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         );
         $this->prepare_builder_image();
         $this->clone_repository();
-
+        $this->set_base_dir();
         $tag = Str::of("{$this->commit}-{$this->application->id}-{$this->pull_request_id}");
         if (strlen($tag) > 128) {
             $tag = $tag->substr(0, 128);
@@ -364,6 +364,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         ]);
         $this->prepare_builder_image();
         $this->clone_repository();
+        $this->set_base_dir();
         $this->cleanup_git();
         if ($this->application->build_pack === 'nixpacks') {
             $this->generate_nixpacks_confs();
@@ -400,7 +401,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         );
     }
 
-
+    private function set_base_dir() {
+        $this->execute_remote_command(
+            [
+                "echo -n 'Setting base directory to {$this->workdir}.'"
+            ],
+        );
+    }
 
     private function clone_repository()
     {
@@ -452,7 +459,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         if ($this->application->deploymentType() === 'deploy_key') {
             $private_key = base64_encode($this->application->private_key->private_key);
-            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_full_url} {$this->workdir}";
+            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_full_url} {$this->basedir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands = collect([
                 executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 112021dac..fb525a8dd 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -41,25 +41,28 @@
                 </div>
             @endif
 
+            <h3>Build</h3>
             @if ($application->could_set_build_commands())
-                <h3>Build</h3>
                 <div class="flex flex-col gap-2 xl:flex-row">
                     <x-forms.input placeholder="pnpm install" id="application.install_command"
                         label="Install Command" />
                     <x-forms.input placeholder="pnpm build" id="application.build_command" label="Build Command" />
                     <x-forms.input placeholder="pnpm start" id="application.start_command" label="Start Command" />
                 </div>
-                <div class="flex flex-col gap-2 xl:flex-row">
-                    <x-forms.input placeholder="/" id="application.base_directory" label="Base Directory"
-                        helper="Directory to use as root. Useful for monorepos." />
+            @endif
+
+            <div class="flex flex-col gap-2 xl:flex-row">
+                <x-forms.input placeholder="/" id="application.base_directory" label="Base Directory"
+                    helper="Directory to use as root. Useful for monorepos." />
+                @if ($application->could_set_build_commands())
                     @if ($application->settings->is_static)
                         <x-forms.input placeholder="/dist" id="application.publish_directory" label="Publish Directory"
                             required />
                     @else
                         <x-forms.input placeholder="/" id="application.publish_directory" label="Publish Directory" />
                     @endif
-                </div>
-            @endif
+                @endif
+            </div>
             @if ($application->dockerfile)
                 <x-forms.textarea label="Dockerfile" id="application.dockerfile" rows="6"> </x-forms.textarea>
             @endif