Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1219 from Dokploy/706-ability-to-use-a-custom-port-for-git

Browse Source 
fix: set extracted port on ssh connection
This commit is contained in:
Mauricio Siu 2025-01-26 17:21:09 -06:00 committed by GitHub
commit 13551f6065
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/server/src/utils/providers/git.ts
View File

@ -69,6 +69,7 @@ export const cloneGitRepository = async (
}); });
} }
const { port } = sanitizeRepoPathSSH(customGitUrl);
await spawnAsync( await spawnAsync(
"git", "git",
[ [
@ -91,7 +92,7 @@ export const cloneGitRepository = async (
env: { env: {
...process.env, ...process.env,
...(customGitSSHKeyId && { ...(customGitSSHKeyId && {
GIT_SSH_COMMAND: `ssh -i ${temporalKeyPath} -o UserKnownHostsFile=${knownHostsPath}`, GIT_SSH_COMMAND: `ssh -i ${temporalKeyPath}${port ? ` -p ${port}` : ""} -o UserKnownHostsFile=${knownHostsPath}`,
}), }),
}, },
}, },
@ -168,7 +169,8 @@ export const getCustomGitCloneCommand = async (
); );
if (customGitSSHKeyId) { if (customGitSSHKeyId) {
const sshKey = await findSSHKeyById(customGitSSHKeyId); const sshKey = await findSSHKeyById(customGitSSHKeyId);
const gitSshCommand = `ssh -i /tmp/id_rsa -o UserKnownHostsFile=${knownHostsPath}`; const { port } = sanitizeRepoPathSSH(customGitUrl);
const gitSshCommand = `ssh -i /tmp/id_rsa${port ? ` -p ${port}` : ""} -o UserKnownHostsFile=${knownHostsPath}`;
command.push( command.push(
` `
echo "${sshKey.privateKey}" > /tmp/id_rsa echo "${sshKey.privateKey}" > /tmp/id_rsa
@ -304,6 +306,7 @@ export const cloneGitRawRepository = async (entity: {
}); });
} }
const { port } = sanitizeRepoPathSSH(customGitUrl);
await spawnAsync( await spawnAsync(
"git", "git",
[ [
@ -322,7 +325,7 @@ export const cloneGitRawRepository = async (entity: {
env: { env: {
...process.env, ...process.env,
...(customGitSSHKeyId && { ...(customGitSSHKeyId && {
GIT_SSH_COMMAND: `ssh -i ${temporalKeyPath} -o UserKnownHostsFile=${knownHostsPath}`, GIT_SSH_COMMAND: `ssh -i ${temporalKeyPath}${port ? ` -p ${port}` : ""} -o UserKnownHostsFile=${knownHostsPath}`,
}), }),
}, },
}, },
@ -381,7 +384,8 @@ export const cloneRawGitRepositoryRemote = async (compose: Compose) => {
command.push(`mkdir -p ${outputPath};`); command.push(`mkdir -p ${outputPath};`);
if (customGitSSHKeyId) { if (customGitSSHKeyId) {
const sshKey = await findSSHKeyById(customGitSSHKeyId); const sshKey = await findSSHKeyById(customGitSSHKeyId);
const gitSshCommand = `ssh -i /tmp/id_rsa -o UserKnownHostsFile=${knownHostsPath}`; const { port } = sanitizeRepoPathSSH(customGitUrl);
const gitSshCommand = `ssh -i /tmp/id_rsa${port ? ` -p ${port}` : ""} -o UserKnownHostsFile=${knownHostsPath}`;
command.push( command.push(
` `
echo "${sshKey.privateKey}" > /tmp/id_rsa echo "${sshKey.privateKey}" > /tmp/id_rsa