diff --git a/apps/api/src/jobs/cleanupStorage.ts b/apps/api/src/jobs/cleanupStorage.ts index 50f7582d8..7c788c790 100644 --- a/apps/api/src/jobs/cleanupStorage.ts +++ b/apps/api/src/jobs/cleanupStorage.ts @@ -15,7 +15,7 @@ import { getEngine } from '../lib/docker'; try { let stdout = null if (!isDev) { - const output = await executeDockerCmd({ dockerId: destination.id, command: `docker exec coolify sh -c 'df -kPT /'` }) + const output = await executeDockerCmd({ dockerId: destination.id, command: `CONTAINER=$(docker ps -lq | head -1) && docker exec $CONTAINER sh -c 'df -kPT /'` }) stdout = output.stdout; } else { const output = await asyncExecShell( diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index 5896422ca..42b771601 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -177,6 +177,7 @@ export async function getApplicationFromDB(id: string, teamId: string) { } export async function getApplicationFromDBWebhook(projectId: number, branch: string) { try { + console.log({ projectId, branch }) let application = await prisma.application.findFirst({ where: { projectId, branch, settings: { autodeploy: true } }, include: { @@ -187,6 +188,7 @@ export async function getApplicationFromDBWebhook(projectId: number, branch: str persistentStorage: true } }); + console.log({ application }) if (!application) { throw { status: 500, message: 'Application not configured.' } } diff --git a/apps/api/src/routes/webhooks/github/handlers.ts b/apps/api/src/routes/webhooks/github/handlers.ts index 401e37d33..5c9a5b63e 100644 --- a/apps/api/src/routes/webhooks/github/handlers.ts +++ b/apps/api/src/routes/webhooks/github/handlers.ts @@ -86,6 +86,7 @@ export async function gitHubEvents(request: FastifyRequest): Promi projectId = repository.id; branch = body.pull_request.head.ref.includes('/') ? body.pull_request.head.ref.split('/')[2] : body.pull_request.head.ref; } + console.log({repository, projectId, branch}) if (!projectId || !branch) { throw { status: 500, message: 'Cannot parse projectId or branch from the webhook?!' } }