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 #426 from Dokploy/fix/correct-path-compose

Browse Source 
Fix/correct path compose
This commit is contained in:
Mauricio Siu 2024-09-07 13:18:44 -06:00 committed by GitHub
commit 1bec376f6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dokploy/server/api/services/compose.ts
View File

@ -174,11 +174,11 @@ export const deployCompose = async ({
try { try {
if (compose.sourceType === "github") { if (compose.sourceType === "github") {
await cloneGithubRepository(compose, deployment.logPath); await cloneGithubRepository(compose, deployment.logPath, true);
} else if (compose.sourceType === "gitlab") { } else if (compose.sourceType === "gitlab") {
await cloneGitlabRepository(compose, deployment.logPath); await cloneGitlabRepository(compose, deployment.logPath, true);
} else if (compose.sourceType === "bitbucket") { } else if (compose.sourceType === "bitbucket") {
await cloneBitbucketRepository(compose, deployment.logPath); await cloneBitbucketRepository(compose, deployment.logPath, true);
} else if (compose.sourceType === "git") { } else if (compose.sourceType === "git") {
await cloneGitRepository(compose, deployment.logPath, true); await cloneGitRepository(compose, deployment.logPath, true);
} else if (compose.sourceType === "raw") { } else if (compose.sourceType === "raw") {

3
apps/dokploy/server/utils/access-log/utils.ts
View File

@ -78,6 +78,7 @@ export function parseRawConfig(
status.some((range) => isStatusInRange(log.DownstreamStatus, range)), status.some((range) => isStatusInRange(log.DownstreamStatus, range)),
); );
} }
const totalCount = parsedLogs.length;
if (sort) { if (sort) {
parsedLogs = _.orderBy( parsedLogs = _.orderBy(
@ -94,8 +95,6 @@ export function parseRawConfig(
parsedLogs = parsedLogs.slice(startIndex, startIndex + page.pageSize); parsedLogs = parsedLogs.slice(startIndex, startIndex + page.pageSize);
} }
const totalCount = parsedLogs.length;
return { data: parsedLogs, totalCount }; return { data: parsedLogs, totalCount };
} catch (error) { } catch (error) {
console.error("Error parsing rawConfig:", error); console.error("Error parsing rawConfig:", error);