fix: nestjs buildpack

v3.12.23

.github/workflows/production-release.yml

@@ -104,6 +104,7 @@ jobs:
       - name: Create & publish manifest
         run: |
           docker buildx imagetools create --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64 --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64 --tag coollabsio/coolify:${{steps.package-version.outputs.current-version}}
+          docker buildx imagetools create coollabsio/coolify:${{steps.package-version.outputs.current-version}} --tag coollabsio/coolify:latest
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

Dockerfile

@@ -22,7 +22,7 @@ ARG DOCKER_VERSION=20.10.18
 # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
 ARG DOCKER_COMPOSE_VERSION=2.6.1
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
+ARG PACK_VERSION=0.27.0
 
 RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3
 RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/
@@ -50,4 +50,4 @@ RUN pnpm install -p
 
 EXPOSE 3000
 ENV CHECKPOINT_DISABLE=1
-CMD pnpm start
+CMD pnpm start

Dockerfile-dev

@@ -9,7 +9,7 @@ ARG DOCKER_VERSION=20.10.18
 # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
 ARG DOCKER_COMPOSE_VERSION=2.6.1
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
+ARG PACK_VERSION=0.27.0
 WORKDIR /app
 
 RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
@@ -28,4 +28,4 @@ RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /
 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack
 
 EXPOSE 3000
-ENV CHECKPOINT_DISABLE=1
+ENV CHECKPOINT_DISABLE=1

README.md

@@ -153,3 +153,6 @@ Support this project with your organization. Your logo will show up here with a
 
 <a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

apps/api/src/jobs/deployApplication.ts

@@ -386,7 +386,7 @@ import * as buildpacks from '../lib/buildPacks';
 
 								try {
 									dockerComposeConfiguration = JSON.parse(dockerComposeConfiguration);
-								} catch (error) {}
+								} catch (error) { }
 								let deployNeeded = true;
 								let destinationType;
 
@@ -453,7 +453,7 @@ import * as buildpacks from '../lib/buildPacks';
 
 									try {
 										await prisma.build.update({ where: { id: buildId }, data: { commit } });
-									} catch (err) {}
+									} catch (err) { }
 
 									if (!pullmergeRequestId) {
 										if (configHash !== currentHash) {
@@ -494,9 +494,8 @@ import * as buildpacks from '../lib/buildPacks';
 									try {
 										await executeCommand({
 											dockerId: destinationDocker.id,
-											command: `docker ${
+											command: `docker ${location ? `--config ${location}` : ''
-												location ? `--config ${location}` : ''
+												} pull ${imageName}:${customTag}`
-											} pull ${imageName}:${customTag}`
 										});
 										imageFoundRemotely = true;
 									} catch (error) {
@@ -659,9 +658,8 @@ import * as buildpacks from '../lib/buildPacks';
 										try {
 											const { stdout: containers } = await executeCommand({
 												dockerId: destinationDockerId,
-												command: `docker ps -a --filter 'label=com.docker.compose.service=${
+												command: `docker ps -a --filter 'label=com.docker.compose.service=${pullmergeRequestId ? imageId : applicationId
-													pullmergeRequestId ? imageId : applicationId
+													}' --format {{.ID}}`
-												}' --format {{.ID}}`
 											});
 											if (containers) {
 												const containerArray = containers.split('\n');

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

@@ -429,7 +429,12 @@ export const setDefaultConfiguration = async (data: any) => {
 		startCommand = template?.startCommand || 'yarn start';
 	if (!buildCommand && buildPack !== 'static' && buildPack !== 'laravel')
 		buildCommand = template?.buildCommand || null;
-	if (!publishDirectory) publishDirectory = template?.publishDirectory || null;
+	if (!publishDirectory) {
+		publishDirectory = template?.publishDirectory || null;
+	} else {
+		if (!publishDirectory.startsWith('/')) publishDirectory = `/${publishDirectory}`;
+		if (publishDirectory.endsWith('/')) publishDirectory = publishDirectory.slice(0, -1);
+	}
 	if (baseDirectory) {
 		if (!baseDirectory.startsWith('/')) baseDirectory = `/${baseDirectory}`;
 		if (baseDirectory.endsWith('/') && baseDirectory !== '/')
@@ -702,9 +707,8 @@ export async function buildImage({
 		buildId,
 		applicationId,
 		dockerId,
-		command: `docker ${location ? `--config ${location}` : ''} build ${
+		command: `docker ${location ? `--config ${location}` : ''} build ${forceRebuild ? '--no-cache' : ''
-			forceRebuild ? '--no-cache' : ''
+			} --progress plain -f ${workdir}/${dockerFile} -t ${cache} --build-arg SOURCE_COMMIT=${commit} ${workdir}`
-		} --progress plain -f ${workdir}/${dockerFile} -t ${cache} --build-arg SOURCE_COMMIT=${commit} ${workdir}`
 	});
 
 	const { status } = await prisma.build.findUnique({ where: { id: buildId } });

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

@@ -95,7 +95,7 @@ export default async function (data) {
 				value['volumes'].push(volume);
 			}
 		}
-		if (dockerComposeConfiguration[key].port) {
+		if (dockerComposeConfiguration[key]?.port) {
 			value['expose'] = [dockerComposeConfiguration[key].port];
 		}
 		if (value['networks']?.length > 0) {

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

@@ -8,7 +8,7 @@ const createDockerfile = async (data, imageforBuild): Promise<void> => {
 	Dockerfile.push(`FROM ${imageforBuild}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}

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

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { buildCacheImageWithNode, buildImage } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
-	const { buildId, applicationId, tag, port, startCommand, workdir, baseDirectory } = data;
+	const { buildId, applicationId, tag, port, startCommand, workdir, publishDirectory } = data;
 	const Dockerfile: Array<string> = [];
 	const isPnpm = startCommand.includes('pnpm');
 
@@ -12,7 +12,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	if (isPnpm) {
 		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${baseDirectory || ''} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD ${startCommand}`);

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

@@ -42,7 +42,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		if (baseImage?.includes('nginx')) {
 			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 		}
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 		Dockerfile.push(`EXPOSE 80`);
 	}
 

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

@@ -42,7 +42,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		if (baseImage?.includes('nginx')) {
 			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 		}
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 		Dockerfile.push(`EXPOSE 80`);
 	}
 

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

@@ -8,7 +8,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	Dockerfile.push('WORKDIR /app');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}

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

@@ -31,7 +31,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		});
 	}
 	if (buildCommand) {
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	} else {
 		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	}

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

@@ -8,7 +8,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}

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

@@ -8,7 +8,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}

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.19';
+export const version = '3.12.24';
 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;
@@ -517,7 +517,7 @@ export async function createRemoteEngineConfiguration(id: string) {
 		await executeCommand({ command: `ssh-keygen -R ${Host}` });
 		await executeCommand({ command: `ssh-keygen -R ${remoteIpAddress}` });
 		await executeCommand({ command: `ssh-keygen -R localhost:${localPort}` });
-	} catch (error) {}
+	} catch (error) { }
 
 	const found = config.find({ Host });
 	const foundIp = config.find({ Host: remoteIpAddress });
@@ -822,97 +822,97 @@ export function generatePassword({
 
 type DatabaseConfiguration =
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				MYSQL_DATABASE: string;
+			MYSQL_DATABASE: string;
-				MYSQL_PASSWORD: string;
+			MYSQL_PASSWORD: string;
-				MYSQL_ROOT_USER: string;
+			MYSQL_ROOT_USER: string;
-				MYSQL_USER: string;
+			MYSQL_USER: string;
-				MYSQL_ROOT_PASSWORD: string;
+			MYSQL_ROOT_PASSWORD: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				MONGO_INITDB_ROOT_USERNAME?: string;
+			MONGO_INITDB_ROOT_USERNAME?: string;
-				MONGO_INITDB_ROOT_PASSWORD?: string;
+			MONGO_INITDB_ROOT_PASSWORD?: string;
-				MONGODB_ROOT_USER?: string;
+			MONGODB_ROOT_USER?: string;
-				MONGODB_ROOT_PASSWORD?: string;
+			MONGODB_ROOT_PASSWORD?: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				MARIADB_ROOT_USER: string;
+			MARIADB_ROOT_USER: string;
-				MARIADB_ROOT_PASSWORD: string;
+			MARIADB_ROOT_PASSWORD: string;
-				MARIADB_USER: string;
+			MARIADB_USER: string;
-				MARIADB_PASSWORD: string;
+			MARIADB_PASSWORD: string;
-				MARIADB_DATABASE: string;
+			MARIADB_DATABASE: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				POSTGRES_PASSWORD?: string;
+			POSTGRES_PASSWORD?: string;
-				POSTGRES_USER?: string;
+			POSTGRES_USER?: string;
-				POSTGRES_DB?: string;
+			POSTGRES_DB?: string;
-				POSTGRESQL_POSTGRES_PASSWORD?: string;
+			POSTGRESQL_POSTGRES_PASSWORD?: string;
-				POSTGRESQL_USERNAME?: string;
+			POSTGRESQL_USERNAME?: string;
-				POSTGRESQL_PASSWORD?: string;
+			POSTGRESQL_PASSWORD?: string;
-				POSTGRESQL_DATABASE?: string;
+			POSTGRESQL_DATABASE?: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				REDIS_AOF_ENABLED: string;
+			REDIS_AOF_ENABLED: string;
-				REDIS_PASSWORD: string;
+			REDIS_PASSWORD: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				COUCHDB_PASSWORD: string;
+			COUCHDB_PASSWORD: string;
-				COUCHDB_USER: string;
+			COUCHDB_USER: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				EDGEDB_SERVER_PASSWORD: string;
+			EDGEDB_SERVER_PASSWORD: string;
-				EDGEDB_SERVER_USER: string;
+			EDGEDB_SERVER_USER: string;
-				EDGEDB_SERVER_DATABASE: string;
+			EDGEDB_SERVER_DATABASE: string;
-				EDGEDB_SERVER_TLS_CERT_MODE: string;
+			EDGEDB_SERVER_TLS_CERT_MODE: string;
-			};
+		};
-	  };
+	};
 export function generateDatabaseConfiguration(database: any): DatabaseConfiguration {
 	const { id, dbUser, dbUserPassword, rootUser, rootUserPassword, defaultDatabase, version, type } =
 		database;
@@ -1011,9 +1011,8 @@ export function generateDatabaseConfiguration(database: any): DatabaseConfigurat
 		};
 		if (isARM()) {
 			configuration.volume = `${id}-${type}-data:/data`;
-			configuration.command = `/usr/local/bin/redis-server --appendonly ${
+			configuration.command = `/usr/local/bin/redis-server --appendonly ${appendOnly ? 'yes' : 'no'
-				appendOnly ? 'yes' : 'no'
+				} --requirepass ${dbUserPassword}`;
-			} --requirepass ${dbUserPassword}`;
 		}
 		return configuration;
 	} else if (type === 'couchdb') {
@@ -1049,7 +1048,7 @@ export function generateDatabaseConfiguration(database: any): DatabaseConfigurat
 }
 export function isARM() {
 	const arch = process.arch;
-	if (arch === 'arm' || arch === 'arm64') {
+	if (arch === 'arm' || arch === 'arm64' || arch === 'aarch' || arch === 'aarch64') {
 		return true;
 	}
 	return false;
@@ -1098,12 +1097,12 @@ export type ComposeFileService = {
 	command?: string;
 	ports?: string[];
 	build?:
-		| {
+	| {
-				context: string;
+		context: string;
-				dockerfile: string;
+		dockerfile: string;
-				args?: Record<string, unknown>;
+		args?: Record<string, unknown>;
-		  }
+	}
-		| string;
+	| string;
 	deploy?: {
 		restart_policy?: {
 			condition?: string;
@@ -1174,7 +1173,7 @@ export const createDirectories = async ({
 	let workdirFound = false;
 	try {
 		workdirFound = !!(await fs.stat(workdir));
-	} catch (error) {}
+	} catch (error) { }
 	if (workdirFound) {
 		await executeCommand({ command: `rm -fr ${workdir}` });
 	}
@@ -1698,7 +1697,7 @@ export async function stopBuild(buildId, applicationId) {
 					}
 				}
 				count++;
-			} catch (error) {}
+			} catch (error) { }
 		}, 100);
 	});
 }
@@ -1721,7 +1720,7 @@ export async function cleanupDockerStorage(dockerId) {
 	// Cleanup images that are not used by any container
 	try {
 		await executeCommand({ dockerId, command: `docker image prune -af` });
-	} catch (error) {}
+	} catch (error) { }
 
 	// Prune coolify managed containers
 	try {
@@ -1729,12 +1728,12 @@ export async function cleanupDockerStorage(dockerId) {
 			dockerId,
 			command: `docker container prune -f --filter "label=coolify.managed=true"`
 		});
-	} catch (error) {}
+	} catch (error) { }
 
 	// Cleanup build caches
 	try {
 		await executeCommand({ dockerId, command: `docker builder prune -af` });
-	} catch (error) {}
+	} catch (error) { }
 }
 
 export function persistentVolumes(id, persistentStorage, config) {

apps/api/src/lib/services/handlers.ts

@@ -50,24 +50,12 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
         const config = {};
         for (const s in template.services) {
             let newEnvironments = []
-            if (arm) {
+            if (template.services[s]?.environment?.length > 0) {
-                if (template.services[s]?.environmentArm?.length > 0) {
+                for (const environment of template.services[s].environment) {
-                    for (const environment of template.services[s].environmentArm) {
+                    let [env, ...value] = environment.split("=");
-                        let [env, ...value] = environment.split("=");
+                    value = value.join("=")
-                        value = value.join("=")
+                    if (!value.startsWith('$$secret') && value !== '') {
-                        if (!value.startsWith('$$secret') && value !== '') {
+                        newEnvironments.push(`${env}=${value}`)
-                            newEnvironments.push(`${env}=${value}`)
-                        }
-                    }
-                }
-            } else {
-                if (template.services[s]?.environment?.length > 0) {
-                    for (const environment of template.services[s].environment) {
-                        let [env, ...value] = environment.split("=");
-                        value = value.join("=")
-                        if (!value.startsWith('$$secret') && value !== '') {
-                            newEnvironments.push(`${env}=${value}`)
-                        }
                     }
                 }
             }
@@ -87,12 +75,13 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
             }
             const customVolumes = await prisma.servicePersistentStorage.findMany({ where: { serviceId: id } })
             let volumes = new Set()
-            if (arm) {
+            if (arm && template.services[s]?.volumesArm?.length > 0) {
-                template.services[s]?.volumesArm && template.services[s].volumesArm.length > 0 && template.services[s].volumesArm.forEach(v => volumes.add(v))
+                template.services[s].volumesArm.forEach(v => volumes.add(v))
             } else {
-                template.services[s]?.volumes && template.services[s].volumes.length > 0 && template.services[s].volumes.forEach(v => volumes.add(v))
+                if (template.services[s]?.volumes?.length > 0) {
+                    template.services[s].volumes.forEach(v => volumes.add(v))
+                }
             }
-
             // Workaround: old plausible analytics service wrong volume id name
             if (service.type === 'plausibleanalytics' && service.plausibleAnalytics?.id) {
                 let temp = Array.from(volumes)

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

@@ -640,9 +640,8 @@ export async function restartApplication(
 
 			const volumes =
 				persistentStorage?.map((storage) => {
-					return `${applicationId}${storage.path.replace(/\//gi, '-')}:${
+					return `${applicationId}${storage.path.replace(/\//gi, '-')}:${buildPack !== 'docker' ? '/app' : ''
-						buildPack !== 'docker' ? '/app' : ''
+						}${storage.path}`;
-					}${storage.path}`;
 				}) || [];
 			const composeVolumes = volumes.map((volume) => {
 				return {
@@ -737,7 +736,7 @@ export async function deleteApplication(
 			where: { id },
 			include: { destinationDocker: true, teams: true }
 		});
-		if (teamId === '0' || !application.teams.some((team) => team.id === teamId)) {
+		if (teamId !== '0' && !application.teams.some((team) => team.id === teamId)) {
 			throw { status: 403, message: 'You are not allowed to delete this application.' };
 		}
 		if (application?.destinationDocker?.id && application.destinationDocker?.network) {
@@ -1428,9 +1427,8 @@ export async function restartPreview(
 
 			const volumes =
 				persistentStorage?.map((storage) => {
-					return `${applicationId}${storage.path.replace(/\//gi, '-')}:${
+					return `${applicationId}${storage.path.replace(/\//gi, '-')}:${buildPack !== 'docker' ? '/app' : ''
-						buildPack !== 'docker' ? '/app' : ''
+						}${storage.path}`;
-					}${storage.path}`;
 				}) || [];
 			const composeVolumes = volumes.map((volume) => {
 				return {

apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte

@@ -406,7 +406,7 @@
 		>
 		{#if tryAgain}
 			<div class="p-5">
-				An error occured during authenticating with GitLab. Please check your GitLab Source
+				An error occurred during authenticating with GitLab. Please check your GitLab Source
 				configuration <a href={`/sources/${application.gitSource.id}`}>here.</a>
 			</div>
 			<button

apps/ui/src/routes/services/[id]/_Storage.svelte

@@ -86,7 +86,7 @@
 					readonly
 					class="w-full"
 					value={`${
-						services.find((s) => s.id === storage.containerId).name || storage.containerId
+						services.find((s) => s.id === storage.containerId)?.name || storage.containerId
 					}`}
 				/>
 			</div>
@@ -111,19 +111,18 @@
 							name="containerId"
 							class="w-full lg:w-64"
 							disabled={storage.predefined}
-							readonly={storage.predefined}
 							bind:value={storage.containerId}
 						>
 							{#if services.length === 1}
 								{#if services[0].name}
-									<option selected value={services[0].id}>{services[0].name}</option>
+									<option selected value={services[0].id}>{services[0]?.name}</option>
 								{:else}
 									<option selected value={services[0]}>{services[0]}</option>
 								{/if}
 							{:else}
 								{#each services as service}
 									{#if service.name}
-										<option value={service.id}>{service.name}</option>
+										<option value={service.id}>{service?.name}</option>
 									{:else}
 										<option value={service}>{service}</option>
 									{/if}
@@ -157,7 +156,7 @@
 				disabled
 				readonly
 				class="w-full"
-				value={`${services.find((s) => s.id === storage.containerId).name || storage.containerId}`}
+				value={`${services.find((s) => s.id === storage.containerId)?.name || storage.containerId}`}
 			/>
 			<input disabled readonly class="w-full" value={`${storage.volumeName}:${storage.path}`} />
 			<button

others/scripts/bumpLatest.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+VERSION=$(cat ./package.json | jq -r .version)
+IMAGE=coollabsio/coolify
+echo "Pulling $IMAGE:$VERSION"
+docker pull $IMAGE:$VERSION
+
+echo "Tagging $IMAGE:$VERSION as $IMAGE:latest"
+docker tag $IMAGE:$VERSION $IMAGE:latest
+
+echo "Pushing $IMAGE:latest"
+read -p "Are you sure you want to push $IMAGE:latest? (y/n) " -n 1 -r
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    echo "Aborting"
+    exit 1
+fi
+
+docker push $IMAGE:latest

package.json

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