From d9599da4a86f302b20f687bc7c84002dde2d16a4 Mon Sep 17 00:00:00 2001
From: Stuart Rowlands <stuart.rowlands@quantcdn.io>
Date: Thu, 21 Dec 2023 11:16:03 -0800
Subject: [PATCH] Fix git clone command for deploy key + docker compose.
---
app/Models/Application.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 43352b867..7a2144fc2 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -862,6 +862,10 @@ class Application extends BaseModel
if (!$only_checkout) {
$git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command_base);
}
+ else {
+ $git_clone_command = "git clone {$fullRepoUrl} -b {$this->git_branch} {$baseDir}";
+ }
+
if ($exec_in_docker) {
$commands = collect([
executeInDocker($deployment_uuid, "mkdir -p /root/.ssh"),
@@ -979,6 +983,7 @@ class Application extends BaseModel
// $fileList->push(".$prComposeFile");
// }
$commands = collect([
+ "rm -rf /tmp/{$uuid}",
"mkdir -p /tmp/{$uuid} && cd /tmp/{$uuid}",
$cloneCommand,
"git sparse-checkout init --cone",