From 967f42dd8922b3c038a9697596f35974b182dc29 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 9 Dec 2022 13:46:06 +0100 Subject: [PATCH] add shell to some cmds --- apps/api/src/index.ts | 6 +++--- apps/api/src/routes/api/v1/handlers.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 366ed5e1c..b1d830adf 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -324,9 +324,9 @@ async function autoUpdater() { const { isAutoUpdateEnabled } = await prisma.setting.findFirst(); if (isAutoUpdateEnabled) { await executeCommand({ command: `docker pull coollabsio/coolify:${latestVersion}` }) - await executeCommand({ command: `env | grep '^COOLIFY' > .env` }) + await executeCommand({ shell: true, command: `env | grep '^COOLIFY' > .env` }) await executeCommand({ command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env` }) - await executeCommand({ command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` }) + await executeCommand({ shell: true, command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` }) } } else { console.log('Updating (not really in dev mode).'); @@ -347,7 +347,7 @@ async function checkFluentBit() { }); const { found } = await checkContainer({ dockerId: id, container: 'coolify-fluentbit', remove: true }); if (!found) { - await executeCommand({ command: `env | grep '^COOLIFY' > .env` }); + await executeCommand({ shell: true, command: `env | grep '^COOLIFY' > .env` }); await executeCommand({ command: `docker compose up -d fluent-bit` }); } } diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts index 072de0abc..438d8a275 100644 --- a/apps/api/src/routes/api/v1/handlers.ts +++ b/apps/api/src/routes/api/v1/handlers.ts @@ -141,9 +141,9 @@ export async function update(request: FastifyRequest) { if (!isDev) { const { isAutoUpdateEnabled } = await prisma.setting.findFirst(); await executeCommand({ command: `docker pull coollabsio/coolify:${latestVersion}` }); - await executeCommand({ command: `env | grep COOLIFY > .env` }); + await executeCommand({ shell: true, command: `env | grep COOLIFY > .env` }); await executeCommand({ command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env` }); - await executeCommand({ command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` }); + await executeCommand({ shell: true, command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` }); return {}; } else { await asyncSleep(2000);