fix: deletion + cleanupStuckedContainers

apps/api/src/index.ts

@@ -171,6 +171,11 @@ const host = '0.0.0.0';
 			await cleanupStorage();
 		}, 60000 * 15);
 
+		// Cleanup stucked containers (not defined in Coolify, but still running and managed by Coolify)
+		setInterval(async () => {
+			await cleanupStuckedContainers();
+		}, 60000 * 5);
+
 		// checkProxies, checkFluentBit & refresh templates
 		setInterval(async () => {
 			await checkProxies();

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

@@ -732,14 +732,15 @@ export async function deleteApplication(
 ) {
 	try {
 		const { id } = request.params;
-		const { force } = request.body;
-
 		const { teamId } = request.user;
 		const application = await prisma.application.findUnique({
 			where: { id },
-			include: { destinationDocker: true }
+			include: { destinationDocker: true, teams: true }
 		});
-		if (!force && application?.destinationDockerId && application.destinationDocker?.network) {
+		if (!application.teams.find((team) => team.id === teamId) || teamId !== '0') {
+			throw { status: 403, message: 'You are not allowed to delete this application.' };
+		}
+		if (application?.destinationDocker?.id && application.destinationDocker?.network) {
 			const { stdout: containers } = await executeCommand({
 				dockerId: application.destinationDocker.id,
 				command: `docker ps -a --filter network=${application.destinationDocker.network} --filter name=${id} --format '{{json .}}'`

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

@@ -427,19 +427,15 @@ export async function deleteDatabase(request: FastifyRequest<DeleteDatabase>) {
 	try {
 		const teamId = request.user.teamId;
 		const { id } = request.params;
-		const { force } = request.body;
 		const database = await prisma.database.findFirst({
 			where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
 			include: { destinationDocker: true, settings: true }
 		});
-		if (!force) {
-			if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
-			if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
-			if (database.destinationDockerId) {
-				const everStarted = await stopDatabaseContainer(database);
-				if (everStarted)
-					await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort);
-			}
+		if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
+		if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
+		if (database.destinationDockerId) {
+			const everStarted = await stopDatabaseContainer(database);
+			if (everStarted) await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort);
 		}
 		await prisma.databaseSettings.deleteMany({ where: { databaseId: id } });
 		await prisma.databaseSecret.deleteMany({ where: { databaseId: id } });

apps/api/src/routes/api/v1/databases/types.ts

@@ -4,7 +4,7 @@ export interface SaveDatabaseType extends OnlyId {
     Body: { type: string }
 }
 export interface DeleteDatabase extends OnlyId {
-    Body: { force: string }
+    Body: { }
 }
 export interface SaveVersion extends OnlyId {
     Body: {

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

@@ -617,6 +617,29 @@ export async function getServiceLogs(request: FastifyRequest<GetServiceLogs>) {
 export async function deleteService(request: FastifyRequest<OnlyId>) {
 	try {
 		const { id } = request.params;
+		const teamId = request.user.teamId;
+		const { destinationDockerId } = await getServiceFromDB({ id, teamId });
+		if (destinationDockerId) {
+			const { stdout: containers } = await executeCommand({
+				dockerId: destinationDockerId,
+				command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}`
+			});
+			if (containers) {
+				const containerArray = containers.split('\n');
+				if (containerArray.length > 0) {
+					for (const container of containerArray) {
+						await executeCommand({
+							dockerId: destinationDockerId,
+							command: `docker stop -t 0 ${container}`
+						});
+						await executeCommand({
+							dockerId: destinationDockerId,
+							command: `docker rm --force ${container}`
+						});
+					}
+				}
+			}
+		}
 		await removeService({ id });
 		return {};
 	} catch ({ status, message }) {