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 #519 from Dokploy/514-failing-to-refresh-docker-composeyml-from-github-repo

Browse Source 
fix(compose): delete content when is remote server
This commit is contained in:
Mauricio Siu
2024-10-03 01:32:50 -06:00
committed by GitHub
parent b5c0876dd4 a5eb4b0a72
commit 6a3ef5c860
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/dokploy/server/utils/providers/bitbucket.ts
View File

@@ -147,15 +147,15 @@ export const cloneRawBitbucketRepositoryRemote = async (compose: Compose) => {
const bitbucketProvider = await findBitbucketById(bitbucketId); const bitbucketProvider = await findBitbucketById(bitbucketId);
const basePath = COMPOSE_PATH; const basePath = COMPOSE_PATH;
const outputPath = join(basePath, appName, "code"); const outputPath = join(basePath, appName, "code");
await recreateDirectory(outputPath);
const repoclone = `bitbucket.org/${bitbucketOwner}/${bitbucketRepository}.git`; const repoclone = `bitbucket.org/${bitbucketOwner}/${bitbucketRepository}.git`;
const cloneUrl = `https://${bitbucketProvider?.bitbucketUsername}:${bitbucketProvider?.appPassword}@${repoclone}`; const cloneUrl = `https://${bitbucketProvider?.bitbucketUsername}:${bitbucketProvider?.appPassword}@${repoclone}`;
try { try {
await execAsyncRemote( const command = `
serverId, rm -rf ${outputPath};
`git clone --branch ${bitbucketBranch} --depth 1 ${cloneUrl} ${outputPath}`, git clone --branch ${bitbucketBranch} --depth 1 ${cloneUrl} ${outputPath}
); `;
await execAsyncRemote(serverId, command);
} catch (error) { } catch (error) {
throw error; throw error;
} }

10
apps/dokploy/server/utils/providers/github.ts
View File

@@ -271,13 +271,13 @@ export const cloneRawGithubRepositoryRemote = async (compose: Compose) => {
const octokit = authGithub(githubProvider); const octokit = authGithub(githubProvider);
const token = await getGithubToken(octokit); const token = await getGithubToken(octokit);
const repoclone = `github.com/${owner}/${repository}.git`; const repoclone = `github.com/${owner}/${repository}.git`;
await recreateDirectory(outputPath);
const cloneUrl = `https://oauth2:${token}@${repoclone}`; const cloneUrl = `https://oauth2:${token}@${repoclone}`;
try { try {
await execAsyncRemote( const command = `
serverId, rm -rf ${outputPath};
`git clone --branch ${branch} --depth 1 ${cloneUrl} ${outputPath}`, git clone --branch ${branch} --depth 1 ${cloneUrl} ${outputPath}
); `;
await execAsyncRemote(serverId, command);
} catch (error) { } catch (error) {
throw error; throw error;
} }

10
apps/dokploy/server/utils/providers/gitlab.ts
View File

@@ -390,14 +390,14 @@ export const cloneRawGitlabRepositoryRemote = async (compose: Compose) => {
await refreshGitlabToken(gitlabId); await refreshGitlabToken(gitlabId);
const basePath = COMPOSE_PATH; const basePath = COMPOSE_PATH;
const outputPath = join(basePath, appName, "code"); const outputPath = join(basePath, appName, "code");
await recreateDirectory(outputPath);
const repoclone = `gitlab.com/${gitlabPathNamespace}.git`; const repoclone = `gitlab.com/${gitlabPathNamespace}.git`;
const cloneUrl = `https://oauth2:${gitlabProvider?.accessToken}@${repoclone}`; const cloneUrl = `https://oauth2:${gitlabProvider?.accessToken}@${repoclone}`;
try { try {
await execAsyncRemote( const command = `
serverId, rm -rf ${outputPath};
`git clone --branch ${branch} --depth 1 ${cloneUrl} ${outputPath}`, git clone --branch ${branch} --depth 1 ${cloneUrl} ${outputPath}
); `;
await execAsyncRemote(serverId, command);
} catch (error) { } catch (error) {
throw error; throw error;
} }

1
apps/dokploy/server/utils/providers/raw.ts
View File

@@ -70,6 +70,7 @@ export const createComposeFileRawRemote = async (compose: Compose) => {
try { try {
const encodedContent = encodeBase64(composeFile); const encodedContent = encodeBase64(composeFile);
const command = ` const command = `
rm -rf ${outputPath};
mkdir -p ${outputPath}; mkdir -p ${outputPath};
echo "${encodedContent}" | base64 -d > "${filePath}"; echo "${encodedContent}" | base64 -d > "${filePath}";
`; `;