package updates + tags selector

apps/api/src/index.ts

@@ -17,7 +17,7 @@ import { verifyRemoteDockerEngineFn } from './routes/api/v1/destinations/handler
 import { checkContainer } from './lib/docker';
 import { migrateServicesToNewTemplate } from './lib';
 import { getTemplates } from './lib/services';
-import { refreshTemplates } from './routes/api/v1/handlers';
+import { refreshTags, refreshTemplates } from './routes/api/v1/handlers';
 declare module 'fastify' {
 	interface FastifyInstance {
 		config: {
@@ -131,12 +131,17 @@ const host = '0.0.0.0';
 	try {
 		const { default: got } = await import('got')
 		try {
+			const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text()
+
 			if (isDev) {
-				const response = await fs.readFile('./devTemplates.yaml', 'utf8')
-				await fs.writeFile('./template.json', JSON.stringify(yaml.load(response), null, 2))
+				const templates = await fs.readFile('./devTemplates.yaml', 'utf8')
+				await fs.writeFile('./template.json', JSON.stringify(yaml.load(templates)))
+				const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text()
+				await fs.writeFile('./tags.json', tags)
 			} else {
 				const response = await got.get('https://get.coollabs.io/coolify/service-templates.yaml').text()
-				await fs.writeFile('/app/template.json', JSON.stringify(yaml.load(response), null, 2))
+				await fs.writeFile('/app/template.json', JSON.stringify(yaml.load(response)))
+				await fs.writeFile('/app/tags.json', tags)
 			}
 
 		} catch (error) {
@@ -173,18 +178,18 @@ const host = '0.0.0.0';
 		setInterval(async () => {
 			await checkProxies();
 			await checkFluentBit();
-
-		}, 10000)
+		}, 60000)
 
 		// Refresh and check templates
 		setInterval(async () => {
 			await refreshTemplates()
+			await refreshTags()
 			await migrateServicesToNewTemplate()
-		}, 10000)
+		}, 60000)
 
 		setInterval(async () => {
 			await copySSLCertificates();
-		}, 2000)
+		}, 10000)
 
 		await Promise.all([
 			getArch(),

apps/api/src/lib/services.ts

@@ -141,3 +141,12 @@ export async function getTemplates() {
     // }
     return templates
 }
+export async function getTags(type?: string) {
+    let tags: any = [];
+    if (isDev) {
+        tags = JSON.parse(await (await fs.readFile('./tags.json')).toString())
+    } else {
+        tags = JSON.parse(await (await fs.readFile('/app/tags.json')).toString())
+    }
+    return tags.find((tag: any) => tag.name.includes(type))
+}

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

@@ -37,18 +37,42 @@ export async function cleanupManually(request: FastifyRequest) {
 		return errorHandler({ status, message });
 	}
 }
+export async function refreshTags() {
+	try {
+		const { default: got } = await import('got')
+		try {
+			const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text()
+			if (isDev) {
+				await fs.writeFile('./tags.json', tags)
+			} else {
+				await fs.writeFile('/app/tags.json', tags)
+			}
+		} catch (error) {
+			console.log(error)
+			throw {
+				status: 500,
+				message: 'Could not fetch templates from get.coollabs.io'
+			};
+		}
+
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
+}
 export async function refreshTemplates() {
 	try {
 		const { default: got } = await import('got')
 		try {
 			if (isDev) {
 				const response = await fs.readFile('./devTemplates.yaml', 'utf8')
-				await fs.writeFile('./template.json', JSON.stringify(yaml.load(response), null, 2))
+				await fs.writeFile('./template.json', JSON.stringify(yaml.load(response)))
 			} else {
 				const response = await got.get('https://get.coollabs.io/coolify/service-templates.yaml').text()
-				await fs.writeFile('/app/template.json', JSON.stringify(yaml.load(response), null, 2))
+				await fs.writeFile('/app/template.json', JSON.stringify(yaml.load(response)))
 			}
 		} catch (error) {
+			console.log(error)
 			throw {
 				status: 500,
 				message: 'Could not fetch templates from get.coollabs.io'

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

@@ -2,17 +2,16 @@ import type { FastifyReply, FastifyRequest } from 'fastify';
 import fs from 'fs/promises';
 import yaml from 'js-yaml';
 import bcrypt from 'bcryptjs';
-import crypto from 'crypto';
-import { prisma, uniqueName, asyncExecShell, getServiceFromDB, getContainerUsage, isDomainConfigured, saveUpdateableFields, fixType, decrypt, encrypt, ComposeFile, getFreePublicPort, getDomain, errorHandler, generatePassword, isDev, stopTcpHttpProxy, executeDockerCmd, checkDomainsIsValidInDNS, checkExposedPort, listSettings } from '../../../../lib/common';
-import { day } from '../../../../lib/dayjs';
-import { checkContainer, isContainerExited } from '../../../../lib/docker';
 import cuid from 'cuid';
 
-import type { OnlyId } from '../../../../types';
+import { prisma, uniqueName, asyncExecShell, getServiceFromDB, getContainerUsage, isDomainConfigured, saveUpdateableFields, fixType, decrypt, encrypt, ComposeFile, getFreePublicPort, getDomain, errorHandler, generatePassword, isDev, stopTcpHttpProxy, executeDockerCmd, checkDomainsIsValidInDNS, checkExposedPort, listSettings } from '../../../../lib/common';
+import { day } from '../../../../lib/dayjs';
+import { checkContainer, } from '../../../../lib/docker';
+import { removeService } from '../../../../lib/services/common';
+import { getTags, getTemplates } from '../../../../lib/services';
+
 import type { ActivateWordpressFtp, CheckService, CheckServiceDomain, DeleteServiceSecret, DeleteServiceStorage, GetServiceLogs, SaveService, SaveServiceDestination, SaveServiceSecret, SaveServiceSettings, SaveServiceStorage, SaveServiceType, SaveServiceVersion, ServiceStartStop, SetGlitchTipSettings, SetWordpressSettings } from './types';
-import { configureServiceType, removeService } from '../../../../lib/services/common';
-import { hashPassword } from '../handlers';
-import { getTemplates } from '../../../../lib/services';
+import type { OnlyId } from '../../../../types';
 
 export async function listServices(request: FastifyRequest) {
     try {
@@ -224,10 +223,12 @@ export async function getService(request: FastifyRequest<OnlyId>) {
         if (service.type) {
             template = await parseAndFindServiceTemplates(service)
         }
+        const tags = await getTags(service.type)
         return {
             settings: await listSettings(),
             service,
             template,
+            tags
         }
     } catch ({ status, message }) {
         console.log(status, message)
@@ -470,7 +471,7 @@ export async function checkService(request: FastifyRequest<CheckService>) {
 export async function saveService(request: FastifyRequest<SaveService>, reply: FastifyReply) {
     try {
         const { id } = request.params;
-        let { name, fqdn, exposePort, type, serviceSetting } = request.body;
+        let { name, fqdn, exposePort, type, serviceSetting, version } = request.body;
         if (fqdn) fqdn = fqdn.toLowerCase();
         if (exposePort) exposePort = Number(exposePort);
         type = fixType(type)
@@ -479,6 +480,7 @@ export async function saveService(request: FastifyRequest<SaveService>, reply: F
             fqdn,
             name,
             exposePort,
+            version,
         }
         const templates = await getTemplates()
         const service = await prisma.service.findUnique({ where: { id } })

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

@@ -48,6 +48,8 @@ export interface SaveService extends OnlyId {
         name: string,
         fqdn: string,
         exposePort: number,
+        version: string,
+        serviceSetting: any
         type: string
     }
 }