rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1566 from stooit/fix/deploy-key-docker-compose

Browse source 
fix: Resolves deployment of docker compose applications when using a deploy key
This commit is contained in:
Andras Bacsai 2023-12-30 13:27:25 +01:00 committed by GitHub
commit a2c7e8d455
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Models/Application.php
View file

@ -862,6 +862,10 @@ function generateGitImportCommands(string $deployment_uuid, int $pull_request_id
if (!$only_checkout) { if (!$only_checkout) {
$git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command_base); $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) { if ($exec_in_docker) {
$commands = collect([ $commands = collect([
executeInDocker($deployment_uuid, "mkdir -p /root/.ssh"), executeInDocker($deployment_uuid, "mkdir -p /root/.ssh"),
@ -979,6 +983,7 @@ function loadComposeFile($isInit = false)
// $fileList->push(".$prComposeFile"); // $fileList->push(".$prComposeFile");
// } // }
$commands = collect([ $commands = collect([
"rm -rf /tmp/{$uuid}",
"mkdir -p /tmp/{$uuid} && cd /tmp/{$uuid}", "mkdir -p /tmp/{$uuid} && cd /tmp/{$uuid}",
$cloneCommand, $cloneCommand,
"git sparse-checkout init --cone", "git sparse-checkout init --cone",