fix: env variables in compose deplyoments

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/src/lib/buildPacks/compose.ts

@@ -52,29 +52,36 @@ export default async function (data) {
 		}
 
 		let environment = typeof value['environment'] === 'undefined' ? [] : value['environment'];
+		let finalEnvs = [...envs];
 		if (Object.keys(environment).length > 0) {
-			environment = Object.entries(environment).map(([key, value]) => `${key}=${value}`);
+			for (const arg of Object.keys(environment)) {
+				const [key, _] = arg.split('=');
+				if (finalEnvs.filter((env) => env.startsWith(key)).length === 0) {
+					finalEnvs.push(arg);
+				}
+			}
+			// environment = Object.entries(environment).map(([key, value]) => `${key}=${value}`);
 		}
-		value['environment'] = [...environment, ...envs];
+		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 +128,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.36';
 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.36",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {