Merge pull request #1321 from coollabsio/next

v4.0.0-beta.83

app/Http/Livewire/Project/Application/General.php

@@ -77,6 +77,10 @@ class General extends Component
     ];
 
     public function updatedApplicationBuildPack(){
+        if ($this->application->build_pack !== 'nixpacks') {
+            $this->application->settings->is_static = $this->is_static = false;
+            $this->application->settings->save();
+        }
         $this->submit();
     }
     public function instantSave()

app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -98,7 +98,6 @@ class GithubPrivateRepositoryDeployKey extends Component
                     'name' => generate_random_name(),
                     'git_repository' => $this->git_repository,
                     'git_branch' => $this->branch,
-                    'git_full_url' => $this->git_repository,
                     'build_pack' => 'nixpacks',
                     'ports_exposes' => $this->port,
                     'publish_directory' => $this->publish_directory,
@@ -112,7 +111,6 @@ class GithubPrivateRepositoryDeployKey extends Component
                     'name' => generate_random_name(),
                     'git_repository' => $this->git_repository,
                     'git_branch' => $this->branch,
-                    'git_full_url' => "git@$this->git_host:$this->git_repository.git",
                     'build_pack' => 'nixpacks',
                     'ports_exposes' => $this->port,
                     'publish_directory' => $this->publish_directory,
@@ -158,6 +156,8 @@ class GithubPrivateRepositoryDeployKey extends Component
             $this->git_host = $this->repository_url_parsed->getHost();
             $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
             $this->git_repository = Str::finish("git@$this->git_host:$this->git_repository", '.git');
+        } else {
+            $this->git_repository = $this->repository_url;
         }
         $this->git_source = 'other';
     }

app/Jobs/ApplicationDeploymentJob.php

@@ -510,8 +510,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         if ($this->application->deploymentType() === 'deploy_key') {
+            $port = 22;
+            preg_match('/(?<=:)\d+(?=\/)/', $this->application->git_repository, $matches);
+            if (count($matches) === 1) {
+                $port = $matches[0];
+            }
             $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->basedir}";
+            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -p $port -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_repository} {$this->basedir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands = collect([
                 executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),
@@ -799,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}/Dockerfile {$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
             ]);
         }
     }

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

database/migrations/2023_03_27_081716_create_applications_table.php

@@ -23,6 +23,7 @@ return new class extends Migration
             $table->string('git_repository');
             $table->string('git_branch');
             $table->string('git_commit_sha')->default('HEAD');
+            // TODO: remove this column, it is not used
             $table->string('git_full_url')->nullable();
 
             $table->string('docker_registry_image_name')->nullable();

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

@@ -36,7 +36,7 @@
         </div>
         @isset($application->private_key_id)
             <h3 class="pt-4">Deploy Key</h3>
-            <div class="py-2 pt-4">Currently attache Private Key: <span
+            <div class="py-2 pt-4">Currently attached Private Key: <span
                     class="text-warning">{{ $application->private_key->name }}</span>
             </div>
 

resources/views/livewire/project/database/redis/general.blade.php

@@ -10,7 +10,7 @@
             <x-forms.input label="Name" id="database.name" />
             <x-forms.input label="Description" id="database.description" />
             <x-forms.input label="Image" id="database.image" required
-                helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/postgres'>https://hub.docker.com/_/postgres</a>" />
+                helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/redis'>https://hub.docker.com/_/redis</a>" />
         </div>
         <div class="flex flex-col gap-2">
             <h3 class="py-2">Network</h3>

versions.json

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