Merge pull request #264 from coollabsio/v2.2.7

v2.2.7

package.json

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

src/lib/buildPacks/docker.ts

@@ -28,11 +28,11 @@ export default async function ({
 				if (secret.isBuildSecret) {
 					if (pullmergeRequestId) {
 						if (secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 						}
 					} else {
 						if (!secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 						}
 					}
 				}

src/lib/buildPacks/nextjs.ts

@@ -23,11 +23,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/buildPacks/node.ts

@@ -24,11 +24,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/buildPacks/nuxtjs.ts

@@ -23,11 +23,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/buildPacks/static.ts

@@ -22,11 +22,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

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/lib/components/templates.ts

@@ -252,6 +252,9 @@ export const buildPacks = [
 	}
 ];
 export const scanningTemplates = {
+	'@sveltejs/kit': {
+		buildPack: 'nodejs'
+	},
 	astro: {
 		buildPack: 'astro'
 	},

src/lib/docker.ts

@@ -27,11 +27,11 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/haproxy/configuration.ts

@@ -33,6 +33,7 @@ frontend http
   bind :80
   bind :443 ssl crt /usr/local/etc/haproxy/ssl/ alpn h2,http/1.1
   acl is_certbot path_beg /.well-known/acme-challenge/
+
   {{#applications}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -43,6 +44,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/applications}}
+
   {{#services}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -53,6 +55,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/services}}
+
   {{#coolify}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -63,6 +66,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/coolify}}
+
   use_backend backend-certbot if is_certbot
   use_backend %[req.hdr(host),lower]
 
@@ -82,6 +86,13 @@ backend backend-certbot
 # updatedAt={{updatedAt}}
 backend {{domain}}
   option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}}
 {{/isRunning}}
 {{/applications}}
@@ -91,6 +102,13 @@ backend {{domain}}
 # updatedAt={{updatedAt}}
 backend {{domain}}
   option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}}
 {{/isRunning}}
 {{/services}}
@@ -99,6 +117,13 @@ backend {{domain}}
 backend {{domain}}
   option forwardfor
   option httpchk GET /undead.json
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}} check fall 10
 {{/coolify}}
 `;
@@ -113,12 +138,7 @@ export async function haproxyInstance() {
 
 export async function configureHAProxy() {
 	const haproxy = await haproxyInstance();
-
+	await checkHAProxy(haproxy);
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return 'Error: HAProxy is not running';
-	}
 
 	try {
 		const data = {

src/lib/haproxy/index.ts

@@ -49,11 +49,7 @@ export async function completeTransaction(transactionId) {
 }
 export async function deleteProxy({ id }) {
 	const haproxy = await haproxyInstance();
-	try {
+	await checkHAProxy(haproxy);
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return 'Error: HAProxy is not running';
-	}
 
 	let transactionId;
 	try {

src/lib/queues/proxy.ts

@@ -5,7 +5,6 @@ export default async function () {
 	try {
 		return await configureHAProxy();
 	} catch (error) {
-		console.log(error.response?.body || error);
 		return ErrorHandler(error.response?.body || error);
 	}
 }

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 } });
 		}