fix: application persistent storage things

apps/api/src/index.ts

@@ -17,7 +17,7 @@ import yaml from 'js-yaml'
 import fs from 'fs/promises';
 import { verifyRemoteDockerEngineFn } from './routes/api/v1/destinations/handlers';
 import { checkContainer } from './lib/docker';
-import { migrateServicesToNewTemplate } from './lib';
+import { migrateApplicationPersistentStorage, migrateServicesToNewTemplate } from './lib';
 import { refreshTags, refreshTemplates } from './routes/api/v1/handlers';
 
 declare module 'fastify' {
@@ -142,7 +142,8 @@ const host = '0.0.0.0';
 		await socketIOServer(fastify)
 		console.log(`Coolify's API is listening on ${host}:${port}`);
 
-		migrateServicesToNewTemplate()
+		migrateServicesToNewTemplate();
+		await migrateApplicationPersistentStorage();
 		await initServer();
 
 		const graceful = new Graceful({ brees: [scheduler] });

apps/api/src/jobs/deployApplication.ts

@@ -117,8 +117,10 @@ import * as buildpacks from '../lib/buildPacks';
 								let domain = getDomain(fqdn);
 								const volumes =
 									persistentStorage?.map((storage) => {
-										return `${applicationId}${storage.path.replace(/\//gi, '-')}:${buildPack !== 'docker' ? '/app' : ''
-											}${storage.path}`;
+										if (storage.oldPath) {
+											return `${applicationId}${storage.path.replace(/\//gi, '-').replace('-app','')}:${storage.path}`;
+										}
+										return `${applicationId}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
 									}) || [];
 								// Previews, we need to get the source branch and set subdomain
 								if (pullmergeRequestId) {

apps/api/src/lib.ts

@@ -2,6 +2,32 @@ import cuid from "cuid";
 import { decrypt, encrypt, fixType, generatePassword, prisma } from "./lib/common";
 import { getTemplates } from "./lib/services";
 
+export async function migrateApplicationPersistentStorage() {
+    const settings = await prisma.setting.findFirst()
+    if (settings) {
+        const { id: settingsId, applicationStoragePathMigrationFinished } = settings
+        try {
+            if (!applicationStoragePathMigrationFinished) {
+                const applications = await prisma.application.findMany({ include: { persistentStorage: true } });
+                for (const application of applications) {
+                    if (application.persistentStorage && application.persistentStorage.length > 0 && application?.buildPack !== 'docker') {
+                        for (const storage of application.persistentStorage) {
+                            let { id, path } = storage
+                            if (!path.startsWith('/app')) {
+                                path = `/app${path}`
+                                await prisma.applicationPersistentStorage.update({ where: { id }, data: { path, oldPath: true } })
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (error) {
+            console.log(error)
+        } finally {
+            await prisma.setting.update({ where: { id: settingsId }, data: { applicationStoragePathMigrationFinished: true } })
+        }
+    }
+}
 export async function migrateServicesToNewTemplate() {
     // This function migrates old hardcoded services to the new template based services
     try {
@@ -456,9 +482,9 @@ async function migrateSettings(settings: any[], service: any, template: any) {
                 variableName = `$$config_${name.toLowerCase()}`
             }
             // console.log('Migrating setting', name, value, 'for service', service.id, ', service name:', service.name, 'variableName: ', variableName)
-    
+
             await prisma.serviceSetting.findFirst({ where: { name: minio, serviceId: service.id } }) || await prisma.serviceSetting.create({ data: { name: minio, value, variableName, service: { connect: { id: service.id } } } })
-        } catch(error) {
+        } catch (error) {
             console.log(error)
         }
     }
@@ -473,7 +499,7 @@ async function migrateSecrets(secrets: any[], service: any) {
             }
             // console.log('Migrating secret', name, value, 'for service', service.id, ', service name:', service.name)
             await prisma.serviceSecret.findFirst({ where: { name, serviceId: service.id } }) || await prisma.serviceSecret.create({ data: { name, value, service: { connect: { id: service.id } } } })
-        } catch(error) {
+        } catch (error) {
             console.log(error)
         }
     }

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

@@ -64,13 +64,14 @@ export default async function (data) {
     } catch (error) {
         //
     }
-    const composeVolumes = volumes.map((volume) => {
-        return {
-            [`${volume.split(':')[0]}`]: {
-                name: volume.split(':')[0]
-            }
-        };
-    });
+    const composeVolumes = [];
+    for (const volume of volumes) {
+        let [v, _] = volume.split(':');
+        composeVolumes[v] = {
+            name: v,
+        }
+     
+    }
     let networks = {}
     for (let [key, value] of Object.entries(dockerComposeYaml.services)) {
         value['container_name'] = `${applicationId}-${key}`
@@ -79,16 +80,19 @@ export default async function (data) {
         // TODO: If we support separated volume for each service, we need to add it here
         if (value['volumes'].length > 0) {
             value['volumes'] = value['volumes'].map((volume) => {
-                let [v, path] = volume.split(':');
+                let [v, path, permission] = volume.split(':');
                 v = `${applicationId}-${v}`
                 composeVolumes[v] = {
                     name: v
                 }
-                return `${v}:${path}`
+                return `${v}:${path}${permission ? ':' + permission : ''}`
             })
         }
+
         if (volumes.length > 0) {
-            value['volumes'] = [...value['volumes'] || '', volumes]
+            for (const volume of volumes) {
+                value['volumes'].push(volume)
+            }
         }
         if (dockerComposeConfiguration[key].port) {
             value['expose'] = [dockerComposeConfiguration[key].port]
@@ -104,7 +108,7 @@ export default async function (data) {
         dockerComposeYaml.services[key] = { ...dockerComposeYaml.services[key], restart: defaultComposeConfiguration(network).restart, deploy: defaultComposeConfiguration(network).deploy }
     }
     if (Object.keys(composeVolumes).length > 0) {
-        dockerComposeYaml['volumes'] = {...composeVolumes}
+        dockerComposeYaml['volumes'] = { ...composeVolumes }
     }
     dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } })
     await fs.writeFile(`${workdir}/docker-compose.${isYml ? 'yml' : 'yaml'}`, yaml.dump(dockerComposeYaml));