fix: docker compose env file

version++

apps/api/devTemplates.yaml

@@ -2440,6 +2440,7 @@
       image: n8nio/n8n:$$core_version
       volumes:
         - $$id-data:/root/.n8n
+        - $$id-data:/home/node/.n8n
         - $$id-data-write:/files
         - /var/run/docker.sock:/var/run/docker.sock
       environment:

apps/api/prisma/seed.js

@@ -381,7 +381,6 @@ main()
 reEncryptSecrets()
 	.catch((e) => {
 		console.error(e);
-		process.exit(1);
 	})
 	.finally(async () => {
 		await prisma.$disconnect();

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

@@ -19,7 +19,9 @@ export default async function (data) {
 		dockerComposeConfiguration,
 		dockerComposeFileLocation
 	} = data;
-	const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}`;
+	const baseDir = `${workdir}${baseDirectory}`;
+	const envFile = `${baseDir}/.env`;
+	const fileYaml = `${baseDir}${dockerComposeFileLocation}`;
 	const dockerComposeRaw = await fs.readFile(fileYaml, 'utf8');
 	const dockerComposeYaml = yaml.load(dockerComposeRaw);
 	if (!dockerComposeYaml.services) {
@@ -31,7 +33,7 @@ export default async function (data) {
 		envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, null)];
 		buildEnvs = [...buildEnvs, ...generateSecrets(secrets, pullmergeRequestId, true, null, true)];
 	}
-
+	await fs.writeFile(envFile, envs.join('\n'));
 	const composeVolumes = [];
 	if (volumes.length > 0) {
 		for (const volume of volumes) {
@@ -50,31 +52,38 @@ export default async function (data) {
 		if (value['env_file']) {
 			delete value['env_file'];
 		}
+		value['env_file'] = [envFile];
 
-		let environment = typeof value['environment'] === 'undefined' ? [] : value['environment'];
-		if (Object.keys(environment).length > 0) {
-			environment = Object.entries(environment).map(([key, value]) => `${key}=${value}`);
-		}
-		value['environment'] = [...environment, ...envs];
+		// let environment = typeof value['environment'] === 'undefined' ? [] : value['environment'];
+		// let finalEnvs = [...envs];
+		// if (Object.keys(environment).length > 0) {
+		// 	for (const arg of Object.keys(environment)) {
+		// 		const [key, _] = arg.split('=');
+		// 		if (finalEnvs.filter((env) => env.startsWith(key)).length === 0) {
+		// 			finalEnvs.push(arg);
+		// 		}
+		// 	}
+		// }
+		// value['environment'] = [...finalEnvs];
 
 		let build = typeof value['build'] === 'undefined' ? [] : value['build'];
 		if (typeof build === 'string') {
 			build = { context: build };
 		}
 		const buildArgs = typeof build['args'] === 'undefined' ? [] : build['args'];
-		let finalArgs = [...buildEnvs];
+		let finalBuildArgs = [...buildEnvs];
 		if (Object.keys(buildArgs).length > 0) {
 			for (const arg of Object.keys(buildArgs)) {
 				const [key, _] = arg.split('=');
-				if (finalArgs.filter((env) => env.startsWith(key)).length === 0) {
-					finalArgs.push(arg);
+				if (finalBuildArgs.filter((env) => env.startsWith(key)).length === 0) {
+					finalBuildArgs.push(arg);
 				}
 			}
 		}
 		if (build.length > 0 || buildArgs.length > 0) {
 			value['build'] = {
 				...build,
-				args: finalArgs
+				args: finalBuildArgs
 			};
 		}
 
@@ -121,7 +130,6 @@ export default async function (data) {
 							.replace(/^\./, `~`)
 							.replace(/^\.\./, '~')
 							.replace(/^\$PWD/, '~');
-						console.log({ source });
 					} else {
 						if (!target) {
 							target = source;

apps/api/src/lib/common.ts

@@ -18,7 +18,7 @@ import { scheduler } from './scheduler';
 import type { ExecaChildProcess } from 'execa';
 import { FastifyReply } from 'fastify';
 
-export const version = '3.12.35';
+export const version = '3.12.37';
 export const isDev = process.env.NODE_ENV === 'development';
 export const proxyPort = process.env.COOLIFY_PROXY_PORT;
 export const proxySecurePort = process.env.COOLIFY_PROXY_SECURE_PORT;

apps/api/src/routes/api/v1/services/handlers.ts

@@ -477,7 +477,7 @@ export async function saveServiceType(
 						const [volumeName, path] = volume.split(':');
 						if (!volumeName.startsWith('/')) {
 							const found = await prisma.servicePersistentStorage.findFirst({
-								where: { volumeName, serviceId: id }
+								where: { volumeName, serviceId: id, path }
 							});
 							if (!found) {
 								await prisma.servicePersistentStorage.create({

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.12.35",
+  "version": "3.12.37",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {