dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Improvement on image pulls

Browse Source
This commit is contained in:
Andras Bacsai
2022-02-24 10:11:48 +01:00
parent 7b4c194b97
commit d6225cbde3
2 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/queues/cleanup.ts
View File

@@ -4,7 +4,6 @@ import { prisma } from '$lib/database';
import { defaultProxyImageHttp, defaultProxyImageTcp } from '$lib/haproxy'; import { defaultProxyImageHttp, defaultProxyImageTcp } from '$lib/haproxy';
export default async function () { export default async function () {
if (!dev) {
const destinationDockers = await prisma.destinationDocker.findMany(); const destinationDockers = await prisma.destinationDocker.findMany();
for (const destinationDocker of destinationDockers) { for (const destinationDocker of destinationDockers) {
const host = getEngine(destinationDocker.engine); const host = getEngine(destinationDocker.engine);
@@ -22,17 +21,22 @@ export default async function () {
'rust:latest' 'rust:latest'
]; ];
for (const image of images) { for (const image of images) {
try {
await asyncExecShell(`DOCKER_HOST=${host} docker image inspect ${image}`);
} catch (error) {
await asyncExecShell( await asyncExecShell(
`DOCKER_HOST=${host} docker pull ${image} && echo "FROM ${image}" | docker build --label coolify.image="true" -t "${image}" -` `DOCKER_HOST=${host} docker pull ${image} && echo "FROM ${image}" | docker build --label coolify.image="true" -t "${image}" -`
); );
} }
}
} catch (error) {} } catch (error) {}
try { try {
await asyncExecShell(`DOCKER_HOST=${host} docker container prune -f`); await asyncExecShell(`DOCKER_HOST=${host} docker container prune -f`);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
// Cleanup images that are not managed by coolify if (!dev) {
//Cleanup images that are not managed by coolify
try { try {
await asyncExecShell( await asyncExecShell(
`DOCKER_HOST=${host} docker image prune --filter 'label!=coolify.image=true' -a -f` `DOCKER_HOST=${host} docker image prune --filter 'label!=coolify.image=true' -a -f`
@@ -40,6 +44,7 @@ export default async function () {
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
}
// Cleanup dangling images // Cleanup dangling images
try { try {
await asyncExecShell(`DOCKER_HOST=${host} docker image prune -f`); await asyncExecShell(`DOCKER_HOST=${host} docker image prune -f`);
@@ -47,5 +52,4 @@ export default async function () {
console.log(error); console.log(error);
} }
} }
}
} }

2
src/lib/queues/index.ts
View File

@@ -87,7 +87,7 @@ const cron = async () => {
await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } }); await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } });
// await queue.ssl.add('ssl', {}, { repeat: { every: 10000 } }); // await queue.ssl.add('ssl', {}, { repeat: { every: 10000 } });
if (!dev) await queue.cleanup.add('cleanup', {}, { repeat: { every: 600000 } }); await queue.cleanup.add('cleanup', {}, { repeat: { every: 600000 } });
await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } }); await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } });
const events = { const events = {