Merge pull request #255 from coollabsio/v2.2.5

v2.2.5

package.json

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

src/lib/common.ts

@@ -129,9 +129,8 @@ export const removeDestinationDocker = async ({ id, engine }) => {
 };
 
 export const createDirectories = async ({ repository, buildId }) => {
-	const dashedRepository = dashify(repository);
+	const repodir = `/tmp/build-sources/${repository}/`;
-	const repodir = `/tmp/build-sources/${dashedRepository}/`;
+	const workdir = `/tmp/build-sources/${repository}/${buildId}`;
-	const workdir = `/tmp/build-sources/${dashedRepository}/${buildId}`;
 
 	await asyncExecShell(`mkdir -p ${workdir}`);
 

src/routes/applications/[id]/configuration/_GitlabRepositories.svelte

@@ -243,9 +243,7 @@
 
 		const url = `/applications/${id}/configuration/repository.json`;
 		try {
-			const repository = `${selected.group.full_path.replace('-personal', '')}/${
+			const repository = selected.project.path_with_namespace;
-				selected.project.name
-			}`;
 			await post(url, {
 				repository,
 				branch: selected.branch.name,

src/routes/settings/index.json.ts

@@ -66,15 +66,10 @@ export const post: RequestHandler = async (event) => {
 	const { fqdn, isRegistrationEnabled, dualCerts, minPort, maxPort } = await event.request.json();
 	try {
 		const { id } = await db.listSettings();
-		if (isRegistrationEnabled) {
+		await db.prisma.setting.update({ where: { id }, data: { isRegistrationEnabled, dualCerts } });
-			await db.prisma.setting.update({ where: { id }, data: { isRegistrationEnabled } });
-		}
 		if (fqdn) {
 			await db.prisma.setting.update({ where: { id }, data: { fqdn } });
 		}
-		if (dualCerts) {
-			await db.prisma.setting.update({ where: { id }, data: { dualCerts } });
-		}
 		if (minPort && maxPort) {
 			await db.prisma.setting.update({ where: { id }, data: { minPort, maxPort } });
 		}