Merge pull request #244 from coollabsio/v2.2.3

v2.2.3

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.2.2",
+	"version": "2.2.3",
 	"license": "AGPL-3.0",
 	"scripts": {
 		"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev",

src/app.d.ts

@@ -13,6 +13,8 @@ declare namespace App {
 		isRunning: boolean;
 		appId: string;
 		readOnly: boolean;
+		source: string;
+		settings: string;
 	}
 }
 

src/lib/common.ts

@@ -2,7 +2,8 @@ import child from 'child_process';
 import util from 'util';
 import { dev } from '$app/env';
 import * as Sentry from '@sentry/node';
-import { uniqueNamesGenerator, Config, adjectives, colors, animals } from 'unique-names-generator';
+import { uniqueNamesGenerator, adjectives, colors, animals } from 'unique-names-generator';
+import type { Config } from 'unique-names-generator';
 
 import * as db from '$lib/database';
 import { buildLogQueue } from './queues';
@@ -107,11 +108,6 @@ export function getEngine(engine) {
 	return engine === '/var/run/docker.sock' ? 'unix:///var/run/docker.sock' : engine;
 }
 
-// export async function saveSshKey(destination) {
-// 	return await asyncExecShell(
-// 		`echo '${destination.sshPrivateKey}' > /tmp/id_rsa_${destination.id} && chmod 600 /tmp/id_rsa_${destination.id}`
-// 	);
-// }
 export async function removeContainer(id, engine) {
 	const host = getEngine(engine);
 	try {
@@ -133,8 +129,9 @@ export const removeDestinationDocker = async ({ id, engine }) => {
 };
 
 export const createDirectories = async ({ repository, buildId }) => {
-	const repodir = `/tmp/build-sources/${repository}/`;
-	const workdir = `/tmp/build-sources/${repository}/${buildId}`;
+	const dashedRepository = dashify(repository);
+	const repodir = `/tmp/build-sources/${dashedRepository}/`;
+	const workdir = `/tmp/build-sources/${dashedRepository}/${buildId}`;
 
 	await asyncExecShell(`mkdir -p ${workdir}`);
 
@@ -151,3 +148,13 @@ export function generateTimestamp() {
 export function getDomain(domain) {
 	return domain?.replace('https://', '').replace('http://', '');
 }
+
+export function dashify(str: string, options?: any): string {
+	if (typeof str !== 'string') return str;
+	return str
+		.trim()
+		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
+		.replace(/^-+|-+$/g, '')
+		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
+		.toLowerCase();
+}

src/lib/components/common.ts

@@ -27,3 +27,13 @@ export function getDomain(domain) {
 export function generateRemoteEngine(destination) {
 	return `ssh://${destination.user}@${destination.ipAddress}:${destination.port}`;
 }
+
+export function dashify(str: string, options?: any): string {
+	if (typeof str !== 'string') return str;
+	return str
+		.trim()
+		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
+		.replace(/^-+|-+$/g, '')
+		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
+		.toLowerCase();
+}

src/lib/database/applications.ts

@@ -78,7 +78,8 @@ export async function getApplicationWebhook({ projectId, branch }) {
 				destinationDocker: true,
 				settings: true,
 				gitSource: { include: { githubApp: true, gitlabApp: true } },
-				secrets: true
+				secrets: true,
+				persistentStorage: true
 			}
 		});
 		if (!application) {

src/routes/new/source/index.svelte

@@ -48,7 +48,7 @@
 </div>
 
 <div class="flex-col space-y-2 pb-10 text-center">
-	<div class="text-xl font-bold text-white">Offical providers</div>
+	<div class="text-xl font-bold text-white">Official providers</div>
 	<div class="flex justify-center space-x-2">
 		<button class="w-32" on:click={() => setPredefined('github')}>GitHub.com</button>
 		<button class="w-32" on:click={() => setPredefined('gitlab')}>GitLab.com</button>

src/routes/sources/[id]/newGithubApp.svelte

@@ -30,8 +30,7 @@
 
 <script>
 	import { dev } from '$app/env';
-	import { getDomain } from '$lib/components/common';
-	import { dashify } from '$lib/github';
+	import { getDomain, dashify } from '$lib/components/common';
 
 	export let source;
 	export let settings;

src/routes/webhooks/github/events.ts

@@ -53,8 +53,8 @@ export const post: RequestHandler = async (event) => {
 				'sha256=' + hmac.update(JSON.stringify(body)).digest('hex'),
 				'utf8'
 			);
-			const checksum = Buffer.from(githubSignature, 'utf8');
 			if (!dev) {
+				const checksum = Buffer.from(githubSignature, 'utf8');
 				if (checksum.length !== digest.length || !crypto.timingSafeEqual(digest, checksum)) {
 					return {
 						status: 500,