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

fix: webhooks

Browse Source
This commit is contained in:
Andras Bacsai 2022-07-25 11:32:44 +00:00
parent 5f3aae066a
commit 101694c998
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/api/src/routes/webhooks/github/handlers.ts
View File

@ -166,7 +166,7 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
if (applicationFound.destinationDockerId) { if (applicationFound.destinationDockerId) {
const isRunning = await checkContainer( const isRunning = await checkContainer(
{ {
dockerId: applicationFound.destinationDocker.engine, dockerId: applicationFound.destinationDocker.id,
container: applicationFound.id container: applicationFound.id
} }
); );
@ -209,7 +209,6 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
} else if (pullmergeRequestAction === 'closed') { } else if (pullmergeRequestAction === 'closed') {
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 {

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

@ -118,7 +118,7 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
if (applicationFound.destinationDockerId) { if (applicationFound.destinationDockerId) {
const isRunning = await checkContainer( const isRunning = await checkContainer(
{ {
dockerId: applicationFound.destinationDocker.engine, dockerId: applicationFound.destinationDocker.id,
container: applicationFound.id container: applicationFound.id
} }
); );