From 12273f424eb4d5d94c10ad27f61cc62f877f87bd Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 25 Jul 2022 13:53:53 +0000 Subject: [PATCH] fix --- .../routes/api/v1/applications/handlers.ts | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index db9aac1e5..a32b50b5d 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -732,8 +732,8 @@ export async function getPreviews(request: FastifyRequest) { const applicationSecrets = secrets.filter((secret) => !secret.isPRMRSecret); const PRMRSecrets = secrets.filter((secret) => secret.isPRMRSecret); - const application = await prisma.application.findUnique({ where: { id }, include: { destinationDocker: true } }) - const { stdout } = await executeDockerCmd({ dockerId: application.destinationDocker.id, command: `docker container ls --filter 'name=${id}-' --format "{{json .}}"` }) + const application = await prisma.application.findUnique({ where: { id }, include: { destinationDocker: true } }); + const { stdout } = await executeDockerCmd({ dockerId: application.destinationDocker.id, command: `docker container ls --filter 'name=${id}-' --format "{{json .}}"` }) if (stdout === '') { return { containers: [], @@ -741,12 +741,20 @@ export async function getPreviews(request: FastifyRequest) { PRMRSecrets: [] } } - const jsonStdout = JSON.parse(stdout) - console.log({jsonStdout, stdout}) + const out = stdout.trim().split('\n') + const jsonStdout = out.map(a => JSON.parse(a)) const containers = jsonStdout.filter((container) => { + const labels = container.Labels.split(',') + let jsonLabels = {} + labels.forEach(l => { + const name = l.split('=')[0] + const value = l.split('=')[1] + jsonLabels = { ...jsonLabels, ...{ [name]: value } } + }) + container.Labels = jsonLabels; return ( - container.Labels['coolify.configuration'] && - container.Labels['coolify.type'] === 'standalone-application' + jsonLabels['coolify.configuration'] && + jsonLabels['coolify.type'] === 'standalone-application' ); }); const jsonContainers = containers @@ -766,6 +774,7 @@ export async function getPreviews(request: FastifyRequest) { }) } } catch ({ status, message }) { + console.log({ status, message }) return errorHandler({ status, message }) } }