From d0374092379ece2069975d15ccea380a9f68868b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 25 Jul 2023 11:40:27 +0200 Subject: [PATCH] updates --- apps/api/prisma/seed.js | 3 +++ apps/api/src/index.ts | 2 +- apps/api/src/routes/api/v1/handlers.ts | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/api/prisma/seed.js b/apps/api/prisma/seed.js index 90fa0183a..4c4b7b208 100644 --- a/apps/api/prisma/seed.js +++ b/apps/api/prisma/seed.js @@ -105,6 +105,9 @@ async function reEncryptSecrets() { if (version) { backupfile = `/app/db/prod.db_${version}_${date}`; } + await execaCommand('env | grep "^COOLIFY" | sort > .env', { + shell: true + }); const secretOld = process.env['COOLIFY_SECRET_KEY']; let secretNew = process.env['COOLIFY_SECRET_KEY_BETTER']; if (!secretNew) { diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 9a5700260..e2e67fc92 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -418,7 +418,7 @@ async function autoUpdater() { }); await executeCommand({ shell: true, - command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db ${image} /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"` + command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db ${image} /bin/sh -c "env | grep "^COOLIFY" | sort > .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 { diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts index 0a65871e3..4d6cd0b5c 100644 --- a/apps/api/src/routes/api/v1/handlers.ts +++ b/apps/api/src/routes/api/v1/handlers.ts @@ -168,7 +168,7 @@ export async function update(request: FastifyRequest) { }); await executeCommand({ shell: true, - command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db ${image} /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"` + command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db ${image} /bin/sh -c "env | grep "^COOLIFY" | sort > .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 {