Merge pull request #554 from coollabsio/next

v3.8.0

apps/api/package.json

@@ -16,7 +16,7 @@
   "dependencies": {
     "@breejs/ts-worker": "2.0.0",
     "@fastify/autoload": "5.2.0",
-    "@fastify/cookie": "7.3.1",
+    "@fastify/cookie": "8.0.0",
     "@fastify/cors": "8.1.0",
     "@fastify/env": "4.1.0",
     "@fastify/jwt": "6.3.2",
@@ -29,13 +29,13 @@
     "cabin": "9.1.2",
     "compare-versions": "4.1.3",
     "cuid": "2.1.8",
-    "dayjs": "1.11.4",
+    "dayjs": "1.11.5",
-    "dockerode": "3.3.3",
+    "dockerode": "3.3.4",
     "dotenv-extended": "2.9.0",
-    "fastify": "4.4.0",
+    "execa": "6.1.0",
-    "fastify-plugin": "4.1.0",
+    "fastify": "4.5.2",
+    "fastify-plugin": "4.2.0",
     "generate-password": "1.7.0",
-    "get-port": "6.1.2",
     "got": "12.3.1",
     "is-ip": "5.0.0",
     "is-port-reachable": "4.0.0",
@@ -50,12 +50,12 @@
     "unique-names-generator": "4.7.1"
   },
   "devDependencies": {
-    "@types/node": "18.6.5",
+    "@types/node": "18.7.11",
     "@types/node-os-utils": "1.3.0",
-    "@typescript-eslint/eslint-plugin": "5.33.0",
+    "@typescript-eslint/eslint-plugin": "5.34.0",
-    "@typescript-eslint/parser": "5.33.0",
+    "@typescript-eslint/parser": "5.34.0",
-    "esbuild": "0.15.0",
+    "esbuild": "0.15.5",
-    "eslint": "8.21.0",
+    "eslint": "8.22.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.2.1",
     "nodemon": "2.0.19",

apps/api/prisma/migrations/20220823070532_service_searxng/migration.sql

@@ -0,0 +1,13 @@
+-- CreateTable
+CREATE TABLE "Searxng" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "secretKey" TEXT NOT NULL,
+    "redisPassword" TEXT NOT NULL,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Searxng_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Searxng_serviceId_key" ON "Searxng"("serviceId");

apps/api/prisma/schema.prisma

@@ -327,23 +327,23 @@ model Service {
   createdAt           DateTime                   @default(now())
   updatedAt           DateTime                   @updatedAt
   destinationDocker   DestinationDocker?         @relation(fields: [destinationDockerId], references: [id])
-
-  fider               Fider?
-  ghost               Ghost?
-  glitchTip           GlitchTip?
-  hasura              Hasura?
-  meiliSearch         MeiliSearch?
-  minio               Minio?
-  moodle              Moodle?
-  plausibleAnalytics  PlausibleAnalytics?
   persistentStorage   ServicePersistentStorage[]
   serviceSecret       ServiceSecret[]
-  umami               Umami?
+  teams               Team[]
-  vscodeserver        Vscodeserver?
-  wordpress           Wordpress?
-  appwrite            Appwrite?
 
-  teams Team[]
+  fider              Fider?
+  ghost              Ghost?
+  glitchTip          GlitchTip?
+  hasura             Hasura?
+  meiliSearch        MeiliSearch?
+  minio              Minio?
+  moodle             Moodle?
+  plausibleAnalytics PlausibleAnalytics?
+  umami              Umami?
+  vscodeserver       Vscodeserver?
+  wordpress          Wordpress?
+  appwrite           Appwrite?
+  searxng            Searxng?
 }
 
 model PlausibleAnalytics {
@@ -545,3 +545,13 @@ model GlitchTip {
   updatedAt                  DateTime @updatedAt
   service                    Service  @relation(fields: [serviceId], references: [id])
 }
+
+model Searxng {
+  id            String   @id @default(cuid())
+  secretKey     String
+  redisPassword String
+  serviceId     String   @unique
+  createdAt     DateTime @default(now())
+  updatedAt     DateTime @updatedAt
+  service       Service  @relation(fields: [serviceId], references: [id])
+}

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

@@ -541,9 +541,6 @@ export async function buildImage({
 	} else {
 		await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
 	}
-	if (debug) {
-		await saveBuildLog({ line: `\n###############\nIMPORTANT: Due to some issues during implementing Remote Docker Engine, the builds logs are not streamed at the moment - but will be soon! You will see the full build log when the build is finished!\n###############`, buildId, applicationId });
-	}
 	if (!debug && isCache) {
 		await saveBuildLog({
 			line: `Debug turned off. To see more details, allow it in the configuration.`,
@@ -553,54 +550,7 @@ export async function buildImage({
 	}
 	const dockerFile = isCache ? `${dockerFileLocation}-cache` : `${dockerFileLocation}`
 	const cache = `${applicationId}:${tag}${isCache ? '-cache' : ''}`
-	const { stderr } = await executeDockerCmd({ dockerId, command: `docker build --progress plain -f ${workdir}/${dockerFile} -t ${cache} ${workdir}` })
+	await executeDockerCmd({ debug, buildId, applicationId, dockerId, command: `docker build --progress plain -f ${workdir}/${dockerFile} -t ${cache} ${workdir}` })
-	if (debug) {
-		const array = stderr.split('\n')
-		for (const line of array) {
-			if (line !== '\n') {
-				await saveBuildLog({
-					line: `${line.replace('\n', '')}`,
-					buildId,
-					applicationId
-				});
-			}
-		}
-	}
-
-
-	// await new Promise((resolve, reject) => {
-	// 	const command = spawn(`docker`, ['build', '-f', `${workdir}${dockerFile}`, '-t', `${cache}`,`${workdir}`], {
-	// 		env: {
-	// 			DOCKER_HOST: 'ssh://root@95.217.178.202',
-	// 			DOCKER_BUILDKIT: '1'
-	// 		}
-	// 	});
-	// 	command.stdout.on('data', function (data) {
-	// 		console.log('stdout: ' + data);
-	// 	});
-	// 	command.stderr.on('data', function (data) {
-	// 		console.log('stderr: ' + data);
-	// 	});
-	// 	command.on('error', function (error) {
-	// 		console.log(error)
-	// 		reject(error)
-	// 	})
-	// 	command.on('exit', function (code) {
-	// 		console.log('exit code: ' + code);
-	// 		resolve(code)
-	// 	});
-	// })
-
-
-	// console.log({ stdout, stderr })
-	// const stream = await docker.engine.buildImage(
-	// 	{ src: ['.'], context: workdir },
-	// 	{
-	// 		dockerfile: isCache ? `${dockerFileLocation}-cache` : dockerFileLocation,
-	// 		t: `${applicationId}:${tag}${isCache ? '-cache' : ''}`
-	// 	}
-	// );
-	// await streamEvents({ stream, docker, buildId, applicationId, debug });
 	if (isCache) {
 		await saveBuildLog({ line: `Building cache image successful.`, buildId, applicationId });
 	} else {

apps/api/src/lib/common.ts

@@ -1,4 +1,4 @@
-import child from 'child_process';
+import { exec } from 'node:child_process'
 import util from 'util';
 import fs from 'fs/promises';
 import yaml from 'js-yaml';
@@ -16,8 +16,9 @@ import sshConfig from 'ssh-config'
 import { checkContainer, removeContainer } from './docker';
 import { day } from './dayjs';
 import * as serviceFields from './serviceFields'
+import { saveBuildLog } from './buildPacks/common';
 
-export const version = '3.7.0';
+export const version = '3.8.0';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -81,10 +82,56 @@ export const include: any = {
 	moodle: true,
 	appwrite: true,
 	glitchTip: true,
+	searxng: true
 };
 
 export const uniqueName = (): string => uniqueNamesGenerator(customConfig);
-export const asyncExecShell = util.promisify(child.exec);
+export const asyncExecShell = util.promisify(exec);
+export const asyncExecShellStream = async ({ debug, buildId, applicationId, command, engine }: { debug: boolean, buildId: string, applicationId: string, command: string, engine: string }) => {
+	return await new Promise(async (resolve, reject) => {
+		const { execaCommand } = await import('execa')
+		const subprocess = execaCommand(command, { env: { DOCKER_BUILDKIT: "1", DOCKER_HOST: engine } })
+		if (debug) {
+			await saveBuildLog({ line: `=========================`, buildId, applicationId });
+			subprocess.stdout.on('data', async (data) => {
+				const stdout = data.toString();
+				const array = stdout.split('\n')
+				for (const line of array) {
+					if (line !== '\n' && line !== '') {
+						await saveBuildLog({
+							line: `${line.replace('\n', '')}`,
+							buildId,
+							applicationId
+						});
+					}
+				}
+			})
+			subprocess.stderr.on('data', async (data) => {
+				const stderr = data.toString();
+				const array = stderr.split('\n')
+				for (const line of array) {
+					if (line !== '\n' && line !== '') {
+						await saveBuildLog({
+							line: `${line.replace('\n', '')}`,
+							buildId,
+							applicationId
+						});
+					}
+				}
+			})
+		}
+		subprocess.on('exit', async (code) => {
+			await asyncSleep(1000);
+			await saveBuildLog({ line: `=========================`, buildId, applicationId });
+			if (code === 0) {
+				resolve(code)
+			} else {
+				reject(code)
+			}
+		})
+	})
+}
+
 export const asyncSleep = (delay: number): Promise<unknown> =>
 	new Promise((resolve) => setTimeout(resolve, delay));
 export const prisma = new PrismaClient({
@@ -311,6 +358,17 @@ export const supportedServiceTypesAndVersions = [
 			main: 8000
 		}
 	},
+	{
+		name: 'searxng',
+		fancyName: 'SearXNG',
+		baseImage: 'searxng/searxng',
+		images: [],
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8080
+		}
+	},
 ];
 
 export async function checkDoubleBranch(branch: string, projectId: number): Promise<boolean> {
@@ -545,21 +603,38 @@ export const supportedDatabaseTypesAndVersions = [
 	}
 ];
 
-export async function getFreeSSHLocalPort(id: string): Promise<number> {
+export async function getFreeSSHLocalPort(id: string): Promise<number | boolean> {
-	const { default: getPort, portNumbers } = await import('get-port');
+	const { default: isReachable } = await import('is-port-reachable');
 	const { remoteIpAddress, sshLocalPort } = await prisma.destinationDocker.findUnique({ where: { id } })
 	if (sshLocalPort) {
 		return Number(sshLocalPort)
 	}
+
+	const data = await prisma.setting.findFirst();
+	const { minPort, maxPort } = data;
+
 	const ports = await prisma.destinationDocker.findMany({ where: { sshLocalPort: { not: null }, remoteIpAddress: { not: remoteIpAddress } } })
-	const alreadyConfigured = await prisma.destinationDocker.findFirst({ where: { remoteIpAddress, id: { not: id }, sshLocalPort: { not: null } } })
+
+	const alreadyConfigured = await prisma.destinationDocker.findFirst({
+		where: {
+			remoteIpAddress, id: { not: id }, sshLocalPort: { not: null }
+		}
+	})
 	if (alreadyConfigured?.sshLocalPort) {
 		await prisma.destinationDocker.update({ where: { id }, data: { sshLocalPort: alreadyConfigured.sshLocalPort } })
 		return Number(alreadyConfigured.sshLocalPort)
 	}
-	const availablePort = await getPort({ port: portNumbers(10000, 10100), exclude: ports.map(p => p.sshLocalPort) })
+	const range = generateRangeArray(minPort, maxPort)
-	await prisma.destinationDocker.update({ where: { id }, data: { sshLocalPort: Number(availablePort) } })
+	console.log({ ports })
-	return Number(availablePort)
+	const availablePorts = range.filter(port => !ports.map(p => p.sshLocalPort).includes(port))
+	for (const port of availablePorts) {
+		const found = await isReachable(port, { host: 'localhost' })
+		if (!found) {
+			await prisma.destinationDocker.update({ where: { id }, data: { sshLocalPort: Number(port) } })
+			return Number(port)
+		}
+	}
+	return false
 }
 
 export async function createRemoteEngineConfiguration(id: string) {
@@ -591,7 +666,7 @@ export async function createRemoteEngineConfiguration(id: string) {
 		config.append({
 			Host: remoteIpAddress,
 			Hostname: 'localhost',
-			Port: Number(localPort),
+			Port: localPort.toString(),
 			User: remoteUser,
 			IdentityFile: sshKeyFile,
 			StrictHostKeyChecking: 'no'
@@ -604,7 +679,7 @@ export async function createRemoteEngineConfiguration(id: string) {
 	}
 	return await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config))
 }
-export async function executeDockerCmd({ dockerId, command }: { dockerId: string, command: string }) {
+export async function executeDockerCmd({ debug, buildId, applicationId, dockerId, command }: { debug?: boolean, buildId?: string, applicationId?: string, dockerId: string, command: string }): Promise<any> {
 	let { remoteEngine, remoteIpAddress, engine } = await prisma.destinationDocker.findUnique({ where: { id: dockerId } })
 	if (remoteEngine) {
 		await createRemoteEngineConfiguration(dockerId)
@@ -617,6 +692,9 @@ export async function executeDockerCmd({ dockerId, command }: { dockerId: string
 			command = command.replace(/docker compose/gi, 'docker-compose')
 		}
 	}
+	if (command.startsWith(`docker build --progress plain`)) {
+		return await asyncExecShellStream({ debug, buildId, applicationId, command, engine });
+	}
 	return await asyncExecShell(
 		`DOCKER_BUILDKIT=1 DOCKER_HOST="${engine}" ${command}`
 	);
@@ -736,13 +814,18 @@ export async function listSettings(): Promise<any> {
 }
 
 
-export function generatePassword(length = 24, symbols = false): string {
+export function generatePassword({ length = 24, symbols = false, isHex = false }: { length?: number, symbols?: boolean, isHex?: boolean } | null): string {
-	return generator.generate({
+	if (isHex) {
+		return crypto.randomBytes(length).toString("hex");
+	}
+	const password = generator.generate({
 		length,
 		numbers: true,
 		strict: true,
 		symbols
 	});
+
+	return password;
 }
 
 export function generateDatabaseConfiguration(database: any, arch: string):
@@ -1208,7 +1291,7 @@ export async function checkExposedPort({ id, configuredPort, exposePort, dockerI
 	}
 }
 export async function getFreeExposedPort(id, exposePort, dockerId, remoteIpAddress) {
-	const { default: getPort } = await import('get-port');
+	const { default: checkPort } = await import('is-port-reachable');
 	const applicationUsed = await (
 		await prisma.application.findMany({
 			where: { exposePort: { not: null }, id: { not: id }, destinationDockerId: dockerId },
@@ -1222,22 +1305,23 @@ export async function getFreeExposedPort(id, exposePort, dockerId, remoteIpAddre
 		})
 	).map((a) => a.exposePort);
 	const usedPorts = [...applicationUsed, ...serviceUsed];
-	if (remoteIpAddress) {
+	if (usedPorts.includes(exposePort)) {
-		const { default: checkPort } = await import('is-port-reachable');
-		const found = await checkPort(exposePort, { host: remoteIpAddress });
-		if (!found) {
-			return exposePort
-		}
 		return false
 	}
-	return await getPort({ port: Number(exposePort), exclude: usedPorts });
+	const found = await checkPort(exposePort, { host: remoteIpAddress || 'localhost' });
+	if (!found) {
+		return exposePort
+	}
+	return false
 
 }
+export function generateRangeArray(start, end) {
+	return Array.from({ length: (end - start) }, (v, k) => k + start);
+}
 export async function getFreePublicPort(id, dockerId) {
-	const { default: getPort, portNumbers } = await import('get-port');
+	const { default: isReachable } = await import('is-port-reachable');
 	const data = await prisma.setting.findFirst();
 	const { minPort, maxPort } = data;
-
 	const dbUsed = await (
 		await prisma.database.findMany({
 			where: { publicPort: { not: null }, id: { not: id }, destinationDockerId: dockerId },
@@ -1263,7 +1347,15 @@ export async function getFreePublicPort(id, dockerId) {
 		})
 	).map((a) => a.publicPort);
 	const usedPorts = [...dbUsed, ...wpFtpUsed, ...wpUsed, ...minioUsed];
-	return await getPort({ port: portNumbers(minPort, maxPort), exclude: usedPorts });
+	const range = generateRangeArray(minPort, maxPort)
+	const availablePorts = range.filter(port => !usedPorts.includes(port))
+	for (const port of availablePorts) {
+		const found = await isReachable(port, { host: 'localhost' })
+		if (!found) {
+			return port
+		}
+	}
+	return false
 }
 
 export async function startTraefikTCPProxy(
@@ -1392,11 +1484,11 @@ export async function configureServiceType({
 	type: string;
 }): Promise<void> {
 	if (type === 'plausibleanalytics') {
-		const password = encrypt(generatePassword());
+		const password = encrypt(generatePassword({}));
 		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword());
+		const postgresqlPassword = encrypt(generatePassword({}));
 		const postgresqlDatabase = 'plausibleanalytics';
-		const secretKeyBase = encrypt(generatePassword(64));
+		const secretKeyBase = encrypt(generatePassword({ length: 64 }));
 
 		await prisma.service.update({
 			where: { id },
@@ -1420,22 +1512,22 @@ export async function configureServiceType({
 		});
 	} else if (type === 'minio') {
 		const rootUser = cuid();
-		const rootUserPassword = encrypt(generatePassword());
+		const rootUserPassword = encrypt(generatePassword({}));
 		await prisma.service.update({
 			where: { id },
 			data: { type, minio: { create: { rootUser, rootUserPassword } } }
 		});
 	} else if (type === 'vscodeserver') {
-		const password = encrypt(generatePassword());
+		const password = encrypt(generatePassword({}));
 		await prisma.service.update({
 			where: { id },
 			data: { type, vscodeserver: { create: { password } } }
 		});
 	} else if (type === 'wordpress') {
 		const mysqlUser = cuid();
-		const mysqlPassword = encrypt(generatePassword());
+		const mysqlPassword = encrypt(generatePassword({}));
 		const mysqlRootUser = cuid();
-		const mysqlRootUserPassword = encrypt(generatePassword());
+		const mysqlRootUserPassword = encrypt(generatePassword({}));
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1473,11 +1565,11 @@ export async function configureServiceType({
 		});
 	} else if (type === 'ghost') {
 		const defaultEmail = `${cuid()}@example.com`;
-		const defaultPassword = encrypt(generatePassword());
+		const defaultPassword = encrypt(generatePassword({}));
 		const mariadbUser = cuid();
-		const mariadbPassword = encrypt(generatePassword());
+		const mariadbPassword = encrypt(generatePassword({}));
 		const mariadbRootUser = cuid();
-		const mariadbRootUserPassword = encrypt(generatePassword());
+		const mariadbRootUserPassword = encrypt(generatePassword({}));
 
 		await prisma.service.update({
 			where: { id },
@@ -1496,7 +1588,7 @@ export async function configureServiceType({
 			}
 		});
 	} else if (type === 'meilisearch') {
-		const masterKey = encrypt(generatePassword(32));
+		const masterKey = encrypt(generatePassword({ length: 32 }));
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1505,11 +1597,11 @@ export async function configureServiceType({
 			}
 		});
 	} else if (type === 'umami') {
-		const umamiAdminPassword = encrypt(generatePassword());
+		const umamiAdminPassword = encrypt(generatePassword({}));
 		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword());
+		const postgresqlPassword = encrypt(generatePassword({}));
 		const postgresqlDatabase = 'umami';
-		const hashSalt = encrypt(generatePassword(64));
+		const hashSalt = encrypt(generatePassword({ length: 64 }));
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1527,9 +1619,9 @@ export async function configureServiceType({
 		});
 	} else if (type === 'hasura') {
 		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword());
+		const postgresqlPassword = encrypt(generatePassword({}));
 		const postgresqlDatabase = 'hasura';
-		const graphQLAdminPassword = encrypt(generatePassword());
+		const graphQLAdminPassword = encrypt(generatePassword({}));
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1546,9 +1638,9 @@ export async function configureServiceType({
 		});
 	} else if (type === 'fider') {
 		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword());
+		const postgresqlPassword = encrypt(generatePassword({}));
 		const postgresqlDatabase = 'fider';
-		const jwtSecret = encrypt(generatePassword(64, true));
+		const jwtSecret = encrypt(generatePassword({ length: 64, symbols: true }));
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1565,13 +1657,13 @@ export async function configureServiceType({
 		});
 	} else if (type === 'moodle') {
 		const defaultUsername = cuid();
-		const defaultPassword = encrypt(generatePassword());
+		const defaultPassword = encrypt(generatePassword({}));
 		const defaultEmail = `${cuid()} @example.com`;
 		const mariadbUser = cuid();
-		const mariadbPassword = encrypt(generatePassword());
+		const mariadbPassword = encrypt(generatePassword({}));
 		const mariadbDatabase = 'moodle_db';
 		const mariadbRootUser = cuid();
-		const mariadbRootUserPassword = encrypt(generatePassword());
+		const mariadbRootUserPassword = encrypt(generatePassword({}));
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1591,15 +1683,15 @@ export async function configureServiceType({
 			}
 		});
 	} else if (type === 'appwrite') {
-		const opensslKeyV1 = encrypt(generatePassword());
+		const opensslKeyV1 = encrypt(generatePassword({}));
-		const executorSecret = encrypt(generatePassword());
+		const executorSecret = encrypt(generatePassword({}));
-		const redisPassword = encrypt(generatePassword());
+		const redisPassword = encrypt(generatePassword({}));
 		const mariadbHost = `${id}-mariadb`
 		const mariadbUser = cuid();
-		const mariadbPassword = encrypt(generatePassword());
+		const mariadbPassword = encrypt(generatePassword({}));
 		const mariadbDatabase = 'appwrite';
 		const mariadbRootUser = cuid();
-		const mariadbRootUserPassword = encrypt(generatePassword());
+		const mariadbRootUserPassword = encrypt(generatePassword({}));
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1622,11 +1714,11 @@ export async function configureServiceType({
 	} else if (type === 'glitchTip') {
 		const defaultUsername = cuid();
 		const defaultEmail = `${defaultUsername}@example.com`;
-		const defaultPassword = encrypt(generatePassword());
+		const defaultPassword = encrypt(generatePassword({}));
 		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword());
+		const postgresqlPassword = encrypt(generatePassword({}));
 		const postgresqlDatabase = 'glitchTip';
-		const secretKeyBase = encrypt(generatePassword(64));
+		const secretKeyBase = encrypt(generatePassword({ length: 64 }));
 
 		await prisma.service.update({
 			where: { id },
@@ -1645,7 +1737,22 @@ export async function configureServiceType({
 				}
 			}
 		});
-	 } else {
+	} else if (type === 'searxng') {
+		const secretKey = encrypt(generatePassword({ length: 32, isHex: true }))
+		const redisPassword = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				searxng: {
+					create: {
+						secretKey,
+						redisPassword,
+					}
+				}
+			}
+		});
+	} else {
 		await prisma.service.update({
 			where: { id },
 			data: {
@@ -1670,6 +1777,7 @@ export async function removeService({ id }: { id: string }): Promise<void> {
 	await prisma.glitchTip.deleteMany({ where: { serviceId: id } });
 	await prisma.moodle.deleteMany({ where: { serviceId: id } });
 	await prisma.appwrite.deleteMany({ where: { serviceId: id } });
+	await prisma.searxng.deleteMany({ where: { serviceId: id } });
 	await prisma.service.delete({ where: { id } });
 }
 
@@ -1769,11 +1877,11 @@ export async function stopBuild(buildId, applicationId) {
 					clearInterval(interval);
 					return resolve();
 				}
-				if (count > 100) {
+				if (count > 50) {
 					clearInterval(interval);
 					return reject(new Error('Build canceled'));
 				}
-				const { stdout: buildContainers } = await executeDockerCmd({ dockerId, command: `docker container ls--filter "label=coolify.buildId=${buildId}" --format '{{json .}}'` })
+				const { stdout: buildContainers } = await executeDockerCmd({ dockerId, command: `docker container ls --filter "label=coolify.buildId=${buildId}" --format '{{json .}}'` })
 				if (buildContainers) {
 					const containersArray = buildContainers.trim().split('\n');
 					for (const container of containersArray) {
@@ -1781,14 +1889,15 @@ export async function stopBuild(buildId, applicationId) {
 						const id = containerObj.ID;
 						if (!containerObj.Names.startsWith(`${applicationId} `)) {
 							await removeContainer({ id, dockerId });
-							await cleanupDB(buildId);
 							clearInterval(interval);
 							return resolve();
 						}
 					}
 				}
 				count++;
-			} catch (error) { }
+			} catch (error) { } finally {
+				await cleanupDB(buildId);
+			}
 		}, 100);
 	});
 }

apps/api/src/lib/serviceFields.ts

@@ -671,3 +671,20 @@ export const glitchTip = [{
 	isBoolean: true,
 	isEncrypted: false
 }]
+
+export const searxng = [{
+	name: 'secretKey',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'redisPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+}]

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

@@ -239,8 +239,8 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
             exposePort = Number(exposePort);
         }
 
-        const { destinationDockerId } = await prisma.application.findUnique({ where: { id } })
+        const { destinationDocker: { id: dockerId, remoteIpAddress } } = await prisma.application.findUnique({ where: { id }, include: { destinationDocker: true } })
-        if (exposePort) await checkExposedPort({ id, exposePort, dockerId: destinationDockerId })
+        if (exposePort) await checkExposedPort({ id, exposePort, dockerId, remoteIpAddress })
         if (denoOptions) denoOptions = denoOptions.trim();
         const defaultConfiguration = await setDefaultConfiguration({
             buildPack,

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

@@ -29,9 +29,9 @@ export async function newDatabase(request: FastifyRequest, reply: FastifyReply)
 
         const name = uniqueName();
         const dbUser = cuid();
-        const dbUserPassword = encrypt(generatePassword());
+        const dbUserPassword = encrypt(generatePassword({}));
         const rootUser = cuid();
-        const rootUserPassword = encrypt(generatePassword());
+        const rootUserPassword = encrypt(generatePassword({}));
         const defaultDatabase = cuid();
 
         const { id } = await prisma.database.create({
@@ -433,9 +433,13 @@ export async function saveDatabaseSettings(request: FastifyRequest<SaveDatabaseS
         const { id } = request.params;
         const { isPublic, appendOnly = true } = request.body;
 
-        const { destinationDocker: { id: dockerId } } = await prisma.database.findUnique({ where: { id }, include: { destinationDocker: true } })
+        let publicPort = null
-        const publicPort = await getFreePublicPort(id, dockerId);
 
+        const { destinationDocker: { id: dockerId } } = await prisma.database.findUnique({ where: { id }, include: { destinationDocker: true } })
+       
+        if (isPublic) {
+            publicPort = await getFreePublicPort(id, dockerId);
+        }
         await prisma.database.update({
             where: { id },
             data: {

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

@@ -583,6 +583,9 @@ export async function startService(request: FastifyRequest<ServiceStartStop>) {
         if (type === 'glitchTip') {
             return await startGlitchTipService(request)
         }
+        if (type === 'searxng') {
+            return await startSearXNGService(request)
+        }
         throw `Service type ${type} not supported.`
     } catch (error) {
         throw { status: 500, message: error?.message || error }
@@ -591,56 +594,6 @@ export async function startService(request: FastifyRequest<ServiceStartStop>) {
 export async function stopService(request: FastifyRequest<ServiceStartStop>) {
     try {
         return await stopServiceContainers(request)
-        // const { type } = request.params
-        // if (type === 'plausibleanalytics') {
-        //     return await stopPlausibleAnalyticsService(request)
-        // }
-        // if (type === 'nocodb') {
-        //     return await stopNocodbService(request)
-        // }
-        // if (type === 'minio') {
-        //     return await stopMinioService(request)
-        // }
-        // if (type === 'vscodeserver') {
-        //     return await stopVscodeService(request)
-        // }
-        // if (type === 'wordpress') {
-        //     return await stopWordpressService(request)
-        // }
-        // if (type === 'vaultwarden') {
-        //     return await stopVaultwardenService(request)
-        // }
-        // if (type === 'languagetool') {
-        //     return await stopLanguageToolService(request)
-        // }
-        // if (type === 'n8n') {
-        //     return await stopN8nService(request)
-        // }
-        // if (type === 'uptimekuma') {
-        //     return await stopUptimekumaService(request)
-        // }
-        // if (type === 'ghost') {
-        //     return await stopGhostService(request)
-        // }
-        // if (type === 'meilisearch') {
-        //     return await stopMeilisearchService(request)
-        // }
-        // if (type === 'umami') {
-        //     return await stopUmamiService(request)
-        // }
-        // if (type === 'hasura') {
-        //     return await stopHasuraService(request)
-        // }
-        // if (type === 'fider') {
-        //     return await stopFiderService(request)
-        // }
-        // if (type === 'moodle') {
-        //     return await stopMoodleService(request)
-        // }
-        // if (type === 'glitchTip') {
-        //     return await stopGlitchTipService(request)
-        // }
-        // throw `Service type ${type} not supported.`
     } catch (error) {
         throw { status: 500, message: error?.message || error }
     }
@@ -2415,6 +2368,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
 }
 async function startServiceContainers(dockerId, composeFileDestination) {
     await executeDockerCmd({ dockerId, command: `docker compose -f ${composeFileDestination} pull` })
+    await executeDockerCmd({ dockerId, command: `docker compose -f ${composeFileDestination} build --no-cache` })
     await executeDockerCmd({ dockerId, command: `docker compose -f ${composeFileDestination} create` })
     await executeDockerCmd({ dockerId, command: `docker compose -f ${composeFileDestination} start` })
     await asyncSleep(1000);
@@ -2662,37 +2616,19 @@ async function startGlitchTipService(request: FastifyRequest<ServiceStartStop>)
                     container_name: id,
                     image: config.glitchTip.image,
                     environment: config.glitchTip.environmentVariables,
-                    networks: [network],
                     volumes,
-                    restart: 'always',
                     labels: makeLabelForServices('glitchTip'),
                     ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
-                    deploy: {
+                    depends_on: [`${id}-postgresql`, `${id}-redis`],
-                        restart_policy: {
+                    ...defaultComposeConfiguration(network),
-                            condition: 'on-failure',
-                            delay: '5s',
-                            max_attempts: 3,
-                            window: '120s'
-                        }
-                    },
-                    depends_on: [`${id}-postgresql`, `${id}-redis`]
                 },
                 [`${id}-worker`]: {
                     container_name: `${id}-worker`,
                     image: config.glitchTip.image,
                     command: './bin/run-celery-with-beat.sh',
                     environment: config.glitchTip.environmentVariables,
-                    networks: [network],
+                    depends_on: [`${id}-postgresql`, `${id}-redis`],
-                    restart: 'always',
+                    ...defaultComposeConfiguration(network),
-                    deploy: {
-                        restart_policy: {
-                            condition: 'on-failure',
-                            delay: '5s',
-                            max_attempts: 3,
-                            window: '120s'
-                        }
-                    },
-                    depends_on: [`${id}-postgresql`, `${id}-redis`]
                 },
                 [`${id}-setup`]: {
                     container_name: `${id}-setup`,
@@ -2707,32 +2643,14 @@ async function startGlitchTipService(request: FastifyRequest<ServiceStartStop>)
                     image: config.postgresql.image,
                     container_name: `${id}-postgresql`,
                     environment: config.postgresql.environmentVariables,
-                    networks: [network],
                     volumes: [config.postgresql.volume],
-                    restart: 'always',
+                    ...defaultComposeConfiguration(network),
-                    deploy: {
-                        restart_policy: {
-                            condition: 'on-failure',
-                            delay: '5s',
-                            max_attempts: 3,
-                            window: '120s'
-                        }
-                    }
                 },
                 [`${id}-redis`]: {
                     image: config.redis.image,
                     container_name: `${id}-redis`,
-                    networks: [network],
                     volumes: [config.redis.volume],
-                    restart: 'always',
+                    ...defaultComposeConfiguration(network),
-                    deploy: {
-                        restart_policy: {
-                            condition: 'on-failure',
-                            delay: '5s',
-                            max_attempts: 3,
-                            window: '120s'
-                        }
-                    }
                 }
             },
             networks: {
@@ -2761,54 +2679,93 @@ async function startGlitchTipService(request: FastifyRequest<ServiceStartStop>)
         return errorHandler({ status, message })
     }
 }
-async function stopGlitchTipService(request: FastifyRequest<ServiceStartStop>) {
+
+async function startSearXNGService(request: FastifyRequest<ServiceStartStop>) {
     try {
         const { id } = request.params;
         const teamId = request.user.teamId;
         const service = await getServiceFromDB({ id, teamId });
-        const { destinationDockerId, destinationDocker } = service;
+        const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort, persistentStorage, fqdn, searxng: { secretKey, redisPassword } } =
-        if (destinationDockerId) {
+            service;
-            try {
+        const network = destinationDockerId && destinationDocker.network;
-                const found = await checkContainer({ dockerId: destinationDocker.id, container: id });
+        const port = getServiceMainPort('searxng');
-                if (found) {
+
-                    await removeContainer({ id, dockerId: destinationDocker.id });
+        const { workdir } = await createDirectories({ repository: type, buildId: id });
-                }
+        const image = getServiceImage(type);
-            } catch (error) {
+
-                console.error(error);
+        const config = {
-            }
+            searxng: {
-            try {
+                image: `${image}:${version}`,
-                const found = await checkContainer({ dockerId: destinationDocker.id, container: `${id}-worker` });
+                volume: `${id}-searxng:/etc/searxng`,
-                if (found) {
+                environmentVariables: {
-                    await removeContainer({ id: `${id}-worker`, dockerId: destinationDocker.id });
+                    SEARXNG_BASE_URL: `${fqdn}`
-                }
+                },
-            } catch (error) {
+            },
-                console.error(error);
+            redis: {
-            }
+                image: 'redis:7-alpine',
-            try {
-                const found = await checkContainer({ dockerId: destinationDocker.id, container: `${id}-setup` });
-                if (found) {
-                    await removeContainer({ id: `${id}-setup`, dockerId: destinationDocker.id });
-                }
-            } catch (error) {
-                console.error(error);
-            }
-            try {
-                const found = await checkContainer({ dockerId: destinationDocker.id, container: `${id}-postgresql` });
-                if (found) {
-                    await removeContainer({ id: `${id}-postgresql`, dockerId: destinationDocker.id });
-                }
-            } catch (error) {
-                console.error(error);
-            }
-            try {
-                const found = await checkContainer({ dockerId: destinationDocker.id, container: `${id}-redis` });
-                if (found) {
-                    await removeContainer({ id: `${id}-redis`, dockerId: destinationDocker.id });
-                }
-            } catch (error) {
-                console.error(error);
             }
+        };
+
+        const settingsYml = `
+        # see https://docs.searxng.org/admin/engines/settings.html#use-default-settings
+        use_default_settings: true
+        server:
+          secret_key: ${secretKey}
+          limiter: true
+          image_proxy: true
+        ui:
+          static_use_hash: true
+        redis:
+          url: redis://:${redisPassword}@${id}-redis:6379/0`
+
+        const Dockerfile = `
+        FROM ${config.searxng.image}
+        COPY ./settings.yml /etc/searxng/settings.yml`;
+
+        if (serviceSecret.length > 0) {
+            serviceSecret.forEach((secret) => {
+                config.searxng.environmentVariables[secret.name] = secret.value;
+            });
         }
+        const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config)
+        const composeFile: ComposeFile = {
+            version: '3.8',
+            services: {
+                [id]: {
+                    build: workdir,
+                    container_name: id,
+                    volumes,
+                    environment: config.searxng.environmentVariables,
+                    ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
+                    labels: makeLabelForServices('searxng'),
+                    cap_drop: ['ALL'],
+                    cap_add: ['CHOWN', 'SETGID', 'SETUID', 'DAC_OVERRIDE'],
+                    depends_on: [`${id}-redis`],
+                    ...defaultComposeConfiguration(network),
+                },
+                [`${id}-redis`]: {
+                    container_name: `${id}-redis`,
+                    image: config.redis.image,
+                    command: `redis-server --requirepass ${redisPassword} --save "" --appendonly "no"`,
+                    labels: makeLabelForServices('searxng'),
+                    cap_drop: ['ALL'],
+                    cap_add: ['SETGID', 'SETUID', 'DAC_OVERRIDE'],
+                    ...defaultComposeConfiguration(network),
+                },
+            },
+            networks: {
+                [network]: {
+                    external: true
+                }
+            },
+            volumes: volumeMounts
+        };
+        const composeFileDestination = `${workdir}/docker-compose.yaml`;
+        await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
+        await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile);
+        await fs.writeFile(`${workdir}/settings.yml`, settingsYml);
+
+        await startServiceContainers(destinationDocker.id, composeFileDestination)
         return {}
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -2865,7 +2822,7 @@ export async function activateWordpressFtp(request: FastifyRequest<ActivateWordp
     const publicPort = await getFreePublicPort(id, dockerId);
 
     let ftpUser = cuid();
-    let ftpPassword = generatePassword();
+    let ftpPassword = generatePassword({});
 
     const hostkeyDir = isDev ? '/tmp/hostkeys' : '/app/ssl/hostkeys';
     try {

apps/ui/src/lib/common.ts

@@ -181,6 +181,17 @@ export const supportedServiceTypesAndVersions = [
 			main: 8000
 		}
 	},
+	{
+		name: 'searxng',
+		fancyName: 'SearXNG',
+		baseImage: 'searxng/searxng',
+		images: ['redis:6.2-alpine'],
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8080
+		}
+	},
 ];
 
 export const asyncSleep = (delay: number) =>

apps/ui/src/lib/components/svg/services/Searxng.svelte

@@ -0,0 +1,57 @@
+<script lang="ts">
+	export let isAbsolute = false;
+</script>
+
+<svg
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:cc="http://creativecommons.org/ns#"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:svg="http://www.w3.org/2000/svg"
+	xmlns="http://www.w3.org/2000/svg"
+	id="svg8"
+	version="1.1"
+	viewBox="0 0 92 92"
+	class={isAbsolute ? 'w-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
+>
+	<defs id="defs2" />
+	<metadata id="metadata5">
+		<rdf:RDF>
+			<cc:Work rdf:about="">
+				<dc:format>image/svg+xml</dc:format>
+				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+				<dc:title />
+			</cc:Work>
+		</rdf:RDF>
+	</metadata>
+	<g transform="translate(-40.921303,-17.416526)" id="layer1">
+		<circle
+			r="0"
+			style="fill:none;stroke:#000000;stroke-width:12;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+			cy="92"
+			cx="75"
+			id="path3713"
+		/>
+		<circle
+			r="30"
+			cy="53.902557"
+			cx="75.921303"
+			id="path834"
+			style="fill:none;fill-opacity:1;stroke:#3050ff;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+		/>
+		<path
+			d="m 67.514849,37.91524 a 18,18 0 0 1 21.051475,3.312407 18,18 0 0 1 3.137312,21.078282"
+			id="path852"
+			style="fill:none;fill-opacity:1;stroke:#3050ff;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+		/>
+		<rect
+			transform="rotate(-46.234709)"
+			ry="1.8669105e-13"
+			y="122.08995"
+			x="3.7063529"
+			height="39.963303"
+			width="18.846331"
+			id="rect912"
+			style="opacity:1;fill:#3050ff;fill-opacity:1;stroke:none;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+		/>
+	</g>
+</svg>

apps/ui/src/lib/components/svg/services/ServiceIcons.svelte

@@ -38,4 +38,6 @@
 	<Icons.Moodle {isAbsolute} />
 {:else if type === 'glitchTip'}
 	<Icons.GlitchTip {isAbsolute} />
+{:else if type === 'searxng'}
+	<Icons.Searxng {isAbsolute} />
 {/if}

apps/ui/src/lib/components/svg/services/index.ts

@@ -16,3 +16,4 @@ export { default as Fider } from './Fider.svelte';
 export { default as Appwrite } from './Appwrite.svelte';
 export { default as Moodle } from './Moodle.svelte';
 export { default as GlitchTip }  from './GlitchTip.svelte';
+export { default as Searxng }  from './Searxng.svelte';

apps/ui/src/routes/applications/[id]/secrets.svelte

@@ -43,7 +43,8 @@
 		const batchSecretsPairs = eachValuePair
 			.filter((secret) => !secret.startsWith('#') && secret)
 			.map((secret) => {
-				const [name, value] = secret.split('=');
+				const [name, ...rest] = secret.split('=');
+				const value = rest.join('=');
 				const cleanValue = value?.replaceAll('"', '') || '';
 				return {
 					name,

apps/ui/src/routes/applications/index.svelte

@@ -64,7 +64,7 @@
 		</button>
 	{/if}
 </div>
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !applications || ownApplications.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('application.no_applications_found')}</div>

apps/ui/src/routes/databases/index.svelte

@@ -61,7 +61,7 @@
 	</button>
 </div>
 
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !databases || ownDatabases.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('database.no_databases_found')}</div>

apps/ui/src/routes/destinations/index.svelte

@@ -56,7 +56,7 @@
 		</a>
 	{/if}
 </div>
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('destination.no_destination_found')}</div>

apps/ui/src/routes/iam/index.svelte

@@ -212,6 +212,7 @@
 						<div class="flex items-center justify-center pt-3">
 							<button
 								on:click|preventDefault={() => switchTeam(team.id)}
+								class="btn btn-sm"
 								class:bg-fuchsia-600={$appSession.teamId !== team.id}
 								class:hover:bg-fuchsia-500={$appSession.teamId !== team.id}
 								class:bg-transparent={$appSession.teamId === team.id}

apps/ui/src/routes/index.svelte

@@ -93,11 +93,13 @@
 
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">{$t('index.dashboard')}</div>
-	<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
+	{#if $appSession.teamId === '0'}
-		>Cleanup Storage</button
+		<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
-	>
+			>Cleanup Storage</button
+		>
+	{/if}
 </div>
-<div class="mt-10 pb-12 tracking-tight sm:pb-16">
+<div class="mt-10 pb-12 sm:pb-16">
 	<div class="mx-auto px-10">
 		<div class="flex flex-col justify-center xl:flex-row">
 			{#if applications.length > 0}
@@ -341,6 +343,8 @@
 						</table>
 					</div>
 				</div>
+			{:else}
+				<div class="text-center text-xl font-bold">Nothing is configured yet.</div>
 			{/if}
 			{#if $appSession.teamId === '0'}
 				<Usage />

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

@@ -57,7 +57,7 @@
 	</a>
 {:else if service.type === 'appwrite'}
 	<a href="https://appwrite.io" target="_blank">
-		<Icons.Appwrite/>
+		<Icons.Appwrite />
 	</a>
 {:else if service.type === 'moodle'}
 	<a href="https://moodle.org" target="_blank">
@@ -67,4 +67,8 @@
 	<a href="https://glitchtip.com" target="_blank">
 		<Icons.GlitchTip />
 	</a>
+{:else if service.type === 'searxng'}
+	<a href="https://searxng.org" target="_blank">
+		<Icons.Searxng />
+	</a>
 {/if}

apps/ui/src/routes/services/[id]/_Services/_Searxng.svelte

@@ -0,0 +1,36 @@
+<script lang="ts">
+	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
+	export let service: any;
+</script>
+
+<div class="flex space-x-1 py-5 font-bold">
+	<div class="title">SearXNG</div>
+</div>
+
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="secretKey">Secret Key</label>
+	<CopyPasswordField
+		name="secretKey"
+		id="secretKey"
+		isPasswordField
+		value={service.searxng.secretKey}
+		readonly
+		disabled
+	/>
+</div>
+<div class="flex space-x-1 py-5 font-bold">
+	<div class="title">Redis</div>
+</div>
+
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="redisPassword">{$t('forms.password')}</label>
+	<CopyPasswordField
+		name="redisPassword"
+		id="redisPassword"
+		isPasswordField
+		value={service.searxng.redisPassword}
+		readonly
+		disabled
+	/>
+</div>

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

@@ -29,6 +29,7 @@
 	import Wordpress from './_Wordpress.svelte';
 	import Appwrite from './_Appwrite.svelte';
 	import Moodle from './_Moodle.svelte';
+	import Searxng from './_Searxng.svelte';
 
 	const { id } = $page.params;
 	$: isDisabled =
@@ -402,6 +403,8 @@
 				<Moodle bind:service {readOnly} />
 			{:else if service.type === 'glitchTip'}
 				<GlitchTip bind:service />
+			{:else if service.type === 'searxng'}
+				<Searxng bind:service />
 			{/if}
 		</div>
 	</form>

apps/ui/src/routes/services/index.svelte

@@ -62,7 +62,7 @@
 	</button>
 </div>
 
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !services || ownServices.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('service.no_service')}</div>

apps/ui/src/routes/sources/index.svelte

@@ -56,7 +56,7 @@
 		</a>
 	{/if}
 </div>
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !sources || ownSources.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('source.no_git_sources_found')}</div>

package.json

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