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

fix: df and more debug

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

2
apps/api/src/jobs/cleanupStorage.ts
View File

@ -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(

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

@ -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.' }
}

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

@ -86,6 +86,7 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): 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?!' }
}