Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: pr deployment

Browse Source
This commit is contained in:
Andras Bacsai 2022-08-27 20:42:04 +00:00
parent 2060619e5b
commit a6ffb5c61c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/api/src/routes/api/v1/applications/handlers.ts
View File

@ -451,7 +451,7 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
applicationId: id, applicationId: id,
sourceBranch: branch, sourceBranch: branch,
branch: application.branch, branch: application.branch,
pullmergeRequestId, pullmergeRequestId: pullmergeRequestId.toString(),
forceRebuild, forceRebuild,
destinationDockerId: application.destinationDocker?.id, destinationDockerId: application.destinationDocker?.id,
gitSourceId: application.gitSource?.id, gitSourceId: application.gitSource?.id,

1
apps/api/src/routes/webhooks/gitlab/handlers.ts
View File

@ -152,7 +152,6 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
} else if (action === 'close') { } else if (action === 'close') {
if (applicationFound.destinationDockerId) { if (applicationFound.destinationDockerId) {
const id = `${applicationFound.id}-${pullmergeRequestId}`; const id = `${applicationFound.id}-${pullmergeRequestId}`;
const engine = applicationFound.destinationDocker.engine;
await removeContainer({ id, dockerId: applicationFound.destinationDocker.id }); await removeContainer({ id, dockerId: applicationFound.destinationDocker.id });
} }
return { return {