v1.0.17 (#59)

src/routes/api/v1/application/check.ts

@@ -9,9 +9,9 @@ export async function post(request: Request) {
 		const { DOMAIN } = process.env;
 		const configuration = setDefaultConfiguration(request.body);
 		const configurationFound = await Configuration.find({
-			'repository.id': { '$ne': configuration.repository.id },
+			'repository.id': { $ne: configuration.repository.id },
 			'publish.domain': configuration.publish.domain
-		}).select('-_id -__v -createdAt -updatedAt')
+		}).select('-_id -__v -createdAt -updatedAt');
 		if (configurationFound.length > 0 || configuration.publish.domain === DOMAIN) {
 			return {
 				status: 200,
@@ -24,7 +24,7 @@ export async function post(request: Request) {
 		return {
 			status: 200,
 			body: { success: true, message: 'OK' }
-		}
+		};
 	} catch (error) {
 		await saveServerLog(error);
 		return {

src/routes/api/v1/application/config/index.ts

@@ -9,7 +9,7 @@ export async function post(request: Request) {
 			'repository.name': name,
 			'repository.organization': organization,
 			'repository.branch': branch
-		}).select('-_id -__v -createdAt -updatedAt')
+		}).select('-_id -__v -createdAt -updatedAt');
 
 		if (configurationFound) {
 			return {

src/routes/api/v1/application/config/previewDeployment.ts

@@ -9,26 +9,40 @@ import type { Request } from '@sveltejs/kit';
 export async function post(request: Request) {
 	const { name, organization, branch, isPreviewDeploymentEnabled }: any = request.body || {};
 	if (name && organization && branch) {
-		const configuration = await Configuration.findOneAndUpdate({
-			'repository.name': name,
-			'repository.organization': organization,
-			'repository.branch': branch
-		}, { $set: { 'general.isPreviewDeploymentEnabled': isPreviewDeploymentEnabled, 'general.pullRequest': 0 } }, { new: true }).select('-_id -__v -createdAt -updatedAt')
+		const configuration = await Configuration.findOneAndUpdate(
+			{
+				'repository.name': name,
+				'repository.organization': organization,
+				'repository.branch': branch
+			},
+			{
+				$set: {
+					'general.isPreviewDeploymentEnabled': isPreviewDeploymentEnabled,
+					'general.pullRequest': 0
+				}
+			},
+			{ new: true }
+		).select('-_id -__v -createdAt -updatedAt');
 		if (!isPreviewDeploymentEnabled) {
 			const found = await Configuration.find({
 				'repository.name': name,
 				'repository.organization': organization,
 				'repository.branch': branch,
-				'general.pullRequest': { '$ne': 0 }
-			})
+				'general.pullRequest': { $ne: 0 }
+			});
 			for (const prDeployment of found) {
 				await Configuration.findOneAndRemove({
 					'repository.name': name,
 					'repository.organization': organization,
 					'repository.branch': branch,
 					'publish.domain': prDeployment.publish.domain
-				})
-				const deploys = await Deployment.find({ organization, branch, name, domain: prDeployment.publish.domain });
+				});
+				const deploys = await Deployment.find({
+					organization,
+					branch,
+					name,
+					domain: prDeployment.publish.domain
+				});
 				for (const deploy of deploys) {
 					await ApplicationLog.deleteMany({ deployId: deploy.deployId });
 					await Deployment.deleteMany({ deployId: deploy.deployId });
@@ -51,7 +65,6 @@ export async function post(request: Request) {
 				success: true
 			}
 		};
-
 	}
 	return {
 		status: 500,

src/routes/api/v1/application/deploy/index.ts

@@ -18,7 +18,9 @@ export async function post(request: Request) {
 	}
 	try {
 		await cloneRepository(configuration);
-		const { foundService, imageChanged, configChanged, forceUpdate } = await precheckDeployment(configuration);
+		const { foundService, imageChanged, configChanged, forceUpdate } = await precheckDeployment(
+			configuration
+		);
 		if (foundService && !forceUpdate && !imageChanged && !configChanged) {
 			cleanupTmp(configuration.general.workdir);
 			return {
@@ -60,15 +62,17 @@ export async function post(request: Request) {
 			nickname
 		}).save();
 
-		await Configuration.findOneAndUpdate({
-			'repository.id': id,
-			'repository.organization': organization,
-			'repository.name': name,
-			'repository.branch': branch,
-			'general.pullRequest': { '$in': [null, 0] },
-		},
+		await Configuration.findOneAndUpdate(
+			{
+				'repository.id': id,
+				'repository.organization': organization,
+				'repository.name': name,
+				'repository.branch': branch,
+				'general.pullRequest': { $in: [null, 0] }
+			},
 			{ ...configuration },
-			{ upsert: true, new: true })
+			{ upsert: true, new: true }
+		);
 
 		queueAndBuild(configuration, imageChanged);
 		return {
@@ -81,7 +85,7 @@ export async function post(request: Request) {
 			}
 		};
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 		await Deployment.findOneAndUpdate(
 			{
 				repoId: configuration.repository.id,

src/routes/api/v1/application/deploy/logs/[deployId].ts

@@ -10,8 +10,7 @@ export async function get(request: Request) {
 			.select('-_id -__v')
 			.sort({ createdAt: 'asc' });
 
-		const deploy: any = await Deployment.findOne({ deployId })
-			.select('-_id -__v')
+		const deploy: any = await Deployment.findOne({ deployId }).select('-_id -__v');
 		const finalLogs: any = {};
 		finalLogs.progress = deploy.progress;
 		finalLogs.events = logs.map((log) => log.event);

src/routes/api/v1/application/deploy/logs/index.ts

@@ -21,7 +21,7 @@ export async function get(request: Request) {
 			const updatedAt = dayjs(d.updatedAt).utc();
 			finalLogs.took = updatedAt.diff(dayjs(d.createdAt)) / 1000;
 			finalLogs.since = updatedAt.fromNow();
-			finalLogs.isPr = d.domain.startsWith('pr')
+			finalLogs.isPr = d.domain.startsWith('pr');
 			return finalLogs;
 		});
 		return {

src/routes/api/v1/application/logs.ts

@@ -16,7 +16,7 @@ export async function get(request: Request) {
 			body: { success: true, logs }
 		};
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 		await saveServerLog(error);
 		return {
 			status: 500,

src/routes/api/v1/application/remove.ts

@@ -16,25 +16,25 @@ export async function post(request: Request) {
 			'repository.name': name,
 			'repository.branch': branch,
 			'publish.domain': domain
-		})
+		});
 		if (configurationFound) {
-			const id = configurationFound._id
+			const id = configurationFound._id;
 			if (configurationFound?.general?.pullRequest === 0) {
 				// Main deployment deletion request; deleting main + PRs
 				const allConfiguration = await Configuration.find({
 					'repository.name': name,
 					'repository.organization': organization,
-					'repository.branch': branch,
-				})
+					'repository.branch': branch
+				});
 				for (const config of allConfiguration) {
 					await Configuration.findOneAndRemove({
 						'repository.name': config.repository.name,
 						'repository.organization': config.repository.organization,
-						'repository.branch': config.repository.branch,
-					})
+						'repository.branch': config.repository.branch
+					});
 					await execShellAsync(`docker stack rm ${config.build.container.name}`);
 				}
-				const deploys = await Deployment.find({ organization, branch, name })
+				const deploys = await Deployment.find({ organization, branch, name });
 				for (const deploy of deploys) {
 					await ApplicationLog.deleteMany({ deployId: deploy.deployId });
 					await Deployment.deleteMany({ deployId: deploy.deployId });
@@ -43,9 +43,9 @@ export async function post(request: Request) {
 				purgeImagesAsync(configurationFound);
 			} else {
 				// Delete only PRs
-				await Configuration.findByIdAndRemove(id)
+				await Configuration.findByIdAndRemove(id);
 				await execShellAsync(`docker stack rm ${configurationFound.build.container.name}`);
-				const deploys = await Deployment.find({ organization, branch, name, domain })
+				const deploys = await Deployment.find({ organization, branch, name, domain });
 				for (const deploy of deploys) {
 					await ApplicationLog.deleteMany({ deployId: deploy.deployId });
 					await Deployment.deleteMany({ deployId: deploy.deployId });
@@ -63,7 +63,7 @@ export async function post(request: Request) {
 			}
 		};
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 		return {
 			status: 500,
 			error: {

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

@@ -1,6 +1,6 @@
 import { docker } from '$lib/api/docker';
 import type { Request } from '@sveltejs/kit';
-import Configuration from '$models/Configuration'
+import Configuration from '$models/Configuration';
 export async function get(request: Request) {
 	// Should update this to get data from mongodb and update db with the currently running services on start!
 	const dockerServices = await docker.engine.listServices();
@@ -34,21 +34,21 @@ export async function get(request: Request) {
 		return {};
 	});
 	const configurations = await Configuration.find({
-		'general.pullRequest': { '$in': [null, 0] }
-	}).select('-_id -__v -createdAt')
-	const applications = []
+		'general.pullRequest': { $in: [null, 0] }
+	}).select('-_id -__v -createdAt');
+	const applications = [];
 	for (const configuration of configurations) {
 		const foundPRDeployments = await Configuration.find({
 			'repository.id': configuration.repository.id,
 			'repository.branch': configuration.repository.branch,
-			'general.pullRequest': { '$ne': 0 }
-		}).select('-_id -__v -createdAt')
+			'general.pullRequest': { $ne: 0 }
+		}).select('-_id -__v -createdAt');
 		const payload = {
 			configuration,
 			UpdatedAt: configuration.updatedAt,
-			prBuilds: foundPRDeployments.length > 0 ? true : false,
-		}
-		applications.push(payload)
+			prBuilds: foundPRDeployments.length > 0 ? true : false
+		};
+		applications.push(payload);
 	}
 	return {
 		status: 200,

src/routes/api/v1/services/[serviceName].ts

@@ -4,6 +4,7 @@ import type { Request } from '@sveltejs/kit';
 
 export async function get(request: Request) {
 	const { serviceName } = request.params;
+
 	try {
 		const service = (await docker.engine.listServices()).find(
 			(r) =>

src/routes/api/v1/services/deploy/nocodb/index.ts

@@ -0,0 +1,59 @@
+import type { Request } from '@sveltejs/kit';
+import yaml from 'js-yaml';
+import { promises as fs } from 'fs';
+import { docker } from '$lib/api/docker';
+import { baseServiceConfiguration } from '$lib/api/applications/common';
+import { cleanupTmp, execShellAsync } from '$lib/api/common';
+
+export async function post(request: Request) {
+	let { baseURL } = request.body;
+	const traefikURL = baseURL;
+	baseURL = `https://${baseURL}`;
+	const workdir = '/tmp/nocodb';
+	const deployId = 'nocodb';
+	const stack = {
+		version: '3.8',
+		services: {
+			[deployId]: {
+				image: 'nocodb/nocodb',
+				networks: [`${docker.network}`],
+				deploy: {
+					...baseServiceConfiguration,
+					labels: [
+						'managedBy=coolify',
+						'type=service',
+						'serviceName=nocodb',
+						'configuration=' +
+							JSON.stringify({
+								baseURL
+							}),
+						'traefik.enable=true',
+						'traefik.http.services.' + deployId + '.loadbalancer.server.port=8080',
+						'traefik.http.routers.' + deployId + '.entrypoints=websecure',
+						'traefik.http.routers.' +
+							deployId +
+							'.rule=Host(`' +
+							traefikURL +
+							'`) && PathPrefix(`/`)',
+						'traefik.http.routers.' + deployId + '.tls.certresolver=letsencrypt',
+						'traefik.http.routers.' + deployId + '.middlewares=global-compress'
+					]
+				}
+			}
+		},
+		networks: {
+			[`${docker.network}`]: {
+				external: true
+			}
+		}
+	};
+	await execShellAsync(`mkdir -p ${workdir}`);
+	await fs.writeFile(`${workdir}/stack.yml`, yaml.dump(stack));
+	await execShellAsync('docker stack rm nocodb');
+	await execShellAsync(`cat ${workdir}/stack.yml | docker stack deploy --prune -c - ${deployId}`);
+	cleanupTmp(workdir);
+	return {
+		status: 200,
+		body: { message: 'OK' }
+	};
+}

src/routes/api/v1/webhooks/deploy.ts

@@ -11,9 +11,9 @@ import ApplicationLog from '$models/ApplicationLog';
 import { cleanupStuckedDeploymentsInDB } from '$lib/api/applications/cleanup';
 export async function post(request: Request) {
 	let configuration;
-	const allowedGithubEvents = ['push', 'pull_request']
-	const allowedPRActions = ['opened', , 'reopened', 'synchronize', 'closed']
-	const githubEvent = request.headers['x-github-event']
+	const allowedGithubEvents = ['push', 'pull_request'];
+	const allowedPRActions = ['opened', 'reopened', 'synchronize', 'closed'];
+	const githubEvent = request.headers['x-github-event'];
 	const { GITHUP_APP_WEBHOOK_SECRET } = process.env;
 	const hmac = crypto.createHmac('sha256', GITHUP_APP_WEBHOOK_SECRET);
 	const digest = Buffer.from(
@@ -41,8 +41,8 @@ export async function post(request: Request) {
 
 	try {
 		const applications = await Configuration.find({
-			'repository.id': request.body.repository.id,
-		}).select('-_id -__v -createdAt -updatedAt')
+			'repository.id': request.body.repository.id
+		}).select('-_id -__v -createdAt -updatedAt');
 		if (githubEvent === 'push') {
 			configuration = applications.find((r) => {
 				if (request.body.ref.startsWith('refs')) {
@@ -61,7 +61,9 @@ export async function post(request: Request) {
 					}
 				};
 			}
-			configuration = applications.find((r) => r.repository.branch === request.body['pull_request'].base.ref);
+			configuration = applications.find(
+				(r) => r.repository.branch === request.body['pull_request'].base.ref
+			);
 			if (configuration) {
 				if (!configuration.general.isPreviewDeploymentEnabled) {
 					return {
@@ -71,7 +73,7 @@ export async function post(request: Request) {
 						}
 					};
 				}
-				configuration.general.pullRequest = request.body.number
+				configuration.general.pullRequest = request.body.number;
 			}
 		}
 		if (!configuration) {
@@ -99,7 +101,7 @@ export async function post(request: Request) {
 				'repository.name': name,
 				'repository.branch': branch,
 				'general.pullRequest': pullRequest
-			})
+			});
 			await execShellAsync(`docker stack rm ${configuration.build.container.name}`);
 			return {
 				status: 200,
@@ -110,7 +112,9 @@ export async function post(request: Request) {
 			};
 		}
 		await cloneRepository(configuration);
-		const { foundService, imageChanged, configChanged, forceUpdate } = await precheckDeployment(configuration);
+		const { foundService, imageChanged, configChanged, forceUpdate } = await precheckDeployment(
+			configuration
+		);
 		if (foundService && !forceUpdate && !imageChanged && !configChanged) {
 			cleanupTmp(configuration.general.workdir);
 			return {
@@ -149,27 +153,30 @@ export async function post(request: Request) {
 			nickname
 		}).save();
 
-
 		if (githubEvent === 'pull_request') {
-			await Configuration.findOneAndUpdate({
-				'repository.id': id,
-				'repository.organization': organization,
-				'repository.name': name,
-				'repository.branch': branch,
-				'general.pullRequest': pullRequest
-			},
+			await Configuration.findOneAndUpdate(
+				{
+					'repository.id': id,
+					'repository.organization': organization,
+					'repository.name': name,
+					'repository.branch': branch,
+					'general.pullRequest': pullRequest
+				},
 				{ ...configuration },
-				{ upsert: true, new: true })
+				{ upsert: true, new: true }
+			);
 		} else {
-			await Configuration.findOneAndUpdate({
-				'repository.id': id,
-				'repository.organization': organization,
-				'repository.name': name,
-				'repository.branch': branch,
-				'general.pullRequest': { '$in': [null, 0] }
-			},
+			await Configuration.findOneAndUpdate(
+				{
+					'repository.id': id,
+					'repository.organization': organization,
+					'repository.name': name,
+					'repository.branch': branch,
+					'general.pullRequest': { $in: [null, 0] }
+				},
 				{ ...configuration },
-				{ upsert: true, new: true })
+				{ upsert: true, new: true }
+			);
 		}
 
 		queueAndBuild(configuration, imageChanged);
@@ -183,7 +190,7 @@ export async function post(request: Request) {
 			}
 		};
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 		// console.log(configuration)
 		if (configuration) {
 			cleanupTmp(configuration.general.workdir);
@@ -216,7 +223,7 @@ export async function post(request: Request) {
 		try {
 			await cleanupStuckedDeploymentsInDB();
 		} catch (error) {
-			console.log(error)
+			console.log(error);
 		}
 	}
 }