fix: Cleanup less often and can do it manually

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

@@ -4,7 +4,7 @@ import axios from 'axios';
 import compare from 'compare-versions';
 import cuid from 'cuid';
 import bcrypt from 'bcryptjs';
-import { asyncExecShell, asyncSleep, errorHandler, isDev, prisma, uniqueName, version } from '../../../lib/common';
+import { asyncExecShell, asyncSleep, cleanupDockerStorage, errorHandler, isDev, prisma, uniqueName, version } from '../../../lib/common';
 
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { Login, Update } from '.';
@@ -15,7 +15,14 @@ export async function hashPassword(password: string): Promise<string> {
 	return bcrypt.hash(password, saltRounds);
 }
 
-
+export async function cleanupManually() {
+	try {
+		await cleanupDockerStorage('unix:///var/run/docker.sock', true, true)
+		return {}
+	} catch ({ status, message }) {
+		return errorHandler({ status, message })
+	}
+}
 export async function checkUpdate(request: FastifyRequest) {
 	try {
 		const currentVersion = version;

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

@@ -445,7 +445,7 @@ export async function setPermission(request: FastifyRequest, reply: FastifyReply
 export async function changePassword(request: FastifyRequest, reply: FastifyReply) {
     try {
         const { id } = request.body;
-        await prisma.user.update({ where: { id: undefined }, data: { password: 'RESETME' } });
+        await prisma.user.update({ where: { id }, data: { password: 'RESETME' } });
         return reply.code(201).send()
     } catch ({ status, message }) {
         return errorHandler({ status, message })

apps/api/src/routes/api/v1/index.ts

@@ -1,6 +1,6 @@
 import { FastifyPluginAsync } from 'fastify';
 import { scheduler } from '../../../lib/scheduler';
-import { checkUpdate, login, showDashboard, update, showUsage, getCurrentUser } from './handlers';
+import { checkUpdate, login, showDashboard, update, showUsage, getCurrentUser, cleanupManually } from './handlers';
 
 export interface Update {
 	Body: { latestVersion: string }
@@ -46,6 +46,10 @@ const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
 	fastify.get('/usage', {
 		onRequest: [fastify.authenticate]
 	}, async () => await showUsage());
+
+	fastify.post('/internal/cleanup', {
+		onRequest: [fastify.authenticate]
+	}, async () => await cleanupManually());
 };
 
 export default root;

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

@@ -2,11 +2,75 @@ import type { FastifyReply, FastifyRequest } from 'fastify';
 import fs from 'fs/promises';
 import yaml from 'js-yaml';
 import bcrypt from 'bcryptjs';
-import { prisma, uniqueName, asyncExecShell, getServiceImage, getServiceImages, configureServiceType, getServiceFromDB, getContainerUsage, removeService, isDomainConfigured, saveUpdateableFields, fixType, decrypt, encrypt, getServiceMainPort, createDirectories, ComposeFile, makeLabelForServices, getFreePort, getDomain, errorHandler, supportedServiceTypesAndVersions, generatePassword, isDev, stopTcpHttpProxy } from '../../../../lib/common';
+import { prisma, uniqueName, asyncExecShell, getServiceImage, getServiceImages, configureServiceType, getServiceFromDB, getContainerUsage, removeService, isDomainConfigured, saveUpdateableFields, fixType, decrypt, encrypt, getServiceMainPort, createDirectories, ComposeFile, makeLabelForServices, getFreePort, getDomain, errorHandler, supportedServiceTypesAndVersions, generatePassword, isDev, stopTcpHttpProxy, getAvailableServices } from '../../../../lib/common';
 import { day } from '../../../../lib/dayjs';
 import { checkContainer, dockerInstance, getEngine, removeContainer } from '../../../../lib/docker';
 import cuid from 'cuid';
 
+async function startServiceNew(request: FastifyRequest) {
+    try {
+        const { id } = request.params;
+        const teamId = request.user.teamId;
+        const service = await getServiceFromDB({ id, teamId });
+        const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort } =
+            service;
+        const network = destinationDockerId && destinationDocker.network;
+        const host = getEngine(destinationDocker.engine);
+        const port = getServiceMainPort(type);
+
+        const { workdir } = await createDirectories({ repository: type, buildId: id });
+        const image = getServiceImage(type);
+        const config = (await getAvailableServices()).find((name) => name.name === type).compose
+        const environmentVariables = {}
+        if (serviceSecret.length > 0) {
+            serviceSecret.forEach((secret) => {
+                environmentVariables[secret.name] = secret.value;
+            });
+        }
+        config.services[id] = JSON.parse(JSON.stringify(config.services[type]))
+        config.services[id].container_name = id
+        config.services[id].image = `${image}:${version}`
+        config.services[id].ports = (exposePort ? [`${exposePort}:${port}`] : []),
+            config.services[id].restart = "always"
+        config.services[id].networks = [network]
+        config.services[id].labels = makeLabelForServices(type)
+        config.services[id].deploy = {
+            restart_policy: {
+                condition: 'on-failure',
+                delay: '5s',
+                max_attempts: 3,
+                window: '120s'
+            }
+        }
+        config.networks = {
+            [network]: {
+                external: true
+            }
+        }
+        config.volumes = {}
+        config.services[id].volumes.forEach((volume, index) => {
+            let oldVolumeName = volume.split(':')[0]
+            const path = volume.split(':')[1]
+            oldVolumeName = convertTolOldVolumeNames(type)
+            const volumeName = `${id}-${oldVolumeName}`
+            config.volumes[volumeName] = {
+                name: volumeName
+            }
+            config.services[id].volumes[index] = `${volumeName}:${path}`
+        })
+        delete config.services[type]
+        config.services[id].environment = environmentVariables
+        const composeFileDestination = `${workdir}/docker-compose.yaml`;
+        await fs.writeFile(composeFileDestination, yaml.dump(config));
+        await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
+        await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
+        return {}
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+
+
 export async function listServices(request: FastifyRequest) {
     try {
         const userId = request.user.userId;