An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
Merge remote-tracking branch 'origin/next' into fix/deploy-key-dedicated-path-race
Andras Bacsai3eb5463e3ed0
diff --cc app/Models/Application.phpindex 2e0d2968de,3ad167887a..809b5336ae--- a/app/Models/Application.php+++ b/app/Models/Application.php@@@ -1754,11 -1790,15 +1796,15 @@@ class Application extends BaseMode$fullRepoUrl = $customRepository;$escapedCustomRepository = escapeshellarg($customRepository);$git_clone_command = "{$git_clone_command} {$escapedCustomRepository} {$escapedBaseDir}";- $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command, public: true, commit: $commit);+ $gitConfigOptions = $this->isHttpGitRepository($customRepository) ? $this->withGitHttpTransportConfig() : null;+ if ($gitConfigOptions) {+ $git_clone_command = $this->applyGitConfigOptionsToCloneCommand($git_clone_command, $gitConfigOptions);+ }+ $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command, public: true, commit: $commit, gitConfigOptions: $gitConfigOptions);- $otherSshCommand = "ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa";+ $otherSshCommand = "ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i {$customSshKeyLocation} -o IdentitiesOnly=yes";-if ($pull_request_id !== 0) {+ $gitCommand = isset($gitConfigOptions) ? "git {$gitConfigOptions}" : 'git';if ($git_type === 'gitlab') {$branch = "merge-requests/{$pull_request_id}/head:$pr_branch_name";if ($exec_in_docker) {