Merge pull request #882 from coollabsio/next

v3.12.18

apps/api/src/index.ts

@@ -172,9 +172,9 @@ const host = '0.0.0.0';
 		}, 60000 * 15);
 
 		// Cleanup stucked containers (not defined in Coolify, but still running and managed by Coolify)
-		// setInterval(async () => {
-		// 	await cleanupStuckedContainers();
-		// }, 60000 * 5);
+		setInterval(async () => {
+			await cleanupStuckedContainers();
+		}, 60000);
 
 		// checkProxies, checkFluentBit & refresh templates
 		setInterval(async () => {
@@ -344,9 +344,16 @@ async function cleanupStuckedContainers() {
 				const containersArray = containers.trim().split('\n');
 				if (containersArray.length > 0) {
 					for (const container of containersArray) {
-						const application = await prisma.application.findFirst({ where: { id: container } });
-						const service = await prisma.service.findFirst({ where: { id: container } });
-						const database = await prisma.database.findFirst({ where: { id: container } });
+						const containerId = container.split('-')[0];
+						const application = await prisma.application.findFirst({
+							where: { id: { startsWith: containerId } }
+						});
+						const service = await prisma.service.findFirst({
+							where: { id: { startsWith: containerId } }
+						});
+						const database = await prisma.database.findFirst({
+							where: { id: { startsWith: containerId } }
+						});
 						if (!application && !service && !database) {
 							await executeCommand({ command: `docker container rm -f ${container}` });
 						}

apps/api/src/lib/buildPacks/compose.ts

@@ -66,10 +66,12 @@ export default async function (data) {
 				}
 			}
 		}
+    if (build.length > 0 || buildArgs.length > 0 ) {
 		value['build'] = {
 			...build,
 			args: finalArgs
 		};
+    }
 
 		value['labels'] = labels;
 		// TODO: If we support separated volume for each service, we need to add it here
@@ -116,7 +118,6 @@ export default async function (data) {
 	dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } });
 
 	await fs.writeFile(fileYaml, yaml.dump(dockerComposeYaml));
-	console.log(yaml.dump(dockerComposeYaml));
 	await executeCommand({
 		debug,
 		buildId,

apps/api/src/lib/common.ts

@@ -19,7 +19,7 @@ import { saveBuildLog, saveDockerRegistryCredentials } from './buildPacks/common
 import { scheduler } from './scheduler';
 import type { ExecaChildProcess } from 'execa';
 
-export const version = '3.12.16';
+export const version = '3.12.18';
 export const isDev = process.env.NODE_ENV === 'development';
 export const sentryDSN =
 	'https://409f09bcb7af47928d3e0f46b78987f3@o1082494.ingest.sentry.io/4504236622217216';

apps/api/src/routes/webhooks/traefik/handlers.ts

@@ -2,6 +2,7 @@ import { FastifyRequest } from 'fastify';
 import { errorHandler, getDomain, isDev, prisma, executeCommand } from '../../../lib/common';
 import { getTemplates } from '../../../lib/services';
 import { OnlyId } from '../../../types';
+import { parseAndFindServiceTemplates } from '../../api/v1/services/handlers';
 
 function generateServices(serviceId, containerId, port, isHttp2 = false, isHttps = false) {
 	if (isHttp2) {
@@ -536,10 +537,11 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					}
 					found = JSON.parse(JSON.stringify(found).replaceAll('$$id', id));
 					for (const oneService of Object.keys(found.services)) {
-						const isDomainConfiguration =
-							found?.services[oneService]?.proxy?.filter((p) => p.domain) ?? [];
-						if (isDomainConfiguration.length > 0) {
-							const { proxy } = found.services[oneService];
+						const isDomainAndProxyConfiguration =
+							found?.services[oneService]?.proxy?.filter((p) => p.port) ?? [];
+						if (isDomainAndProxyConfiguration.length > 0) {
+							const template: any = await parseAndFindServiceTemplates(service, null, true);
+							const { proxy } = template.services[oneService] || found.services[oneService];
 							for (let configuration of proxy) {
 								if (configuration.domain) {
 									const setting = serviceSetting.find(

apps/api/src/routes/webhooks/traefik/index.ts

@@ -4,9 +4,11 @@ import { proxyConfiguration, otherProxyConfiguration } from './handlers';
 import { OtherProxyConfiguration } from './types';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
-    fastify.get<OnlyId>('/main.json', async (request, reply) => proxyConfiguration(request, false));
-    fastify.get<OnlyId>('/remote/:id', async (request) => proxyConfiguration(request, true));
-    fastify.get<OtherProxyConfiguration>('/other.json', async (request, reply) => otherProxyConfiguration(request));
+	fastify.get<OnlyId>('/main.json', async (request, reply) => proxyConfiguration(request, false));
+	fastify.get<OnlyId>('/remote/:id', async (request) => proxyConfiguration(request, true));
+	fastify.get<OtherProxyConfiguration>('/other.json', async (request, reply) =>
+		otherProxyConfiguration(request)
+	);
 };
 
 export default root;