Merge pull request #442 from coollabsio/next

fix: Only reconfigure coolify proxy if its missconfigured

package.json

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

prisma/seed.cjs

@@ -70,16 +70,29 @@ async function main() {
 			}
 		});
 	}
-	if (compare('2.9.2', version) >= 0) {
+	if (settings.isTraefikUsed) {
 		// Force stop Coolify Proxy, as it had a bug in < 2.9.2. TrustProxy + api.insecure
 		try {
-			await asyncExecShell(`docker stop -t 0 coolify-proxy && docker rm coolify-proxy`);
-			const { stdout: Config } = await asyncExecShell(
-				`docker network inspect bridge --format '{{json .IPAM.Config }}'`
+			const { stdout } = await asyncExecShell(
+				`docker inspect coolify-proxy --format '{{json .Config.Cmd}}'`
 			);
-			const ip = JSON.parse(Config)[0].Gateway;
-			await asyncExecShell(
-				`docker run --restart always \
+			if (
+				!stdout
+					.replaceAll('[', '')
+					.replaceAll(']', '')
+					.replaceAll('"', '')
+					.replace('\n', '')
+					.split(',')
+					.includes('--entrypoints.web.forwardedHeaders.insecure=true')
+			) {
+				console.log('Reconfiguring Coolify Proxy (Traefik)...');
+				await asyncExecShell(`docker stop -t 0 coolify-proxy && docker rm coolify-proxy`);
+				const { stdout: Config } = await asyncExecShell(
+					`docker network inspect bridge --format '{{json .IPAM.Config }}'`
+				);
+				const ip = JSON.parse(Config)[0].Gateway;
+				await asyncExecShell(
+					`docker run --restart always \
 				--add-host 'host.docker.internal:host-gateway' \
 				--add-host 'host.docker.internal:${ip}' \
 				-v coolify-traefik-letsencrypt:/etc/traefik/acme \
@@ -101,7 +114,8 @@ async function main() {
 				--certificatesresolvers.letsencrypt.acme.storage=/etc/traefik/acme/acme.json \
 				--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web \
 				--log.level=error`
-			);
+				);
+			}
 		} catch (error) {
 			console.log(error);
 		}

src/lib/importers/github.ts

@@ -49,7 +49,7 @@ export default async function ({
 		applicationId
 	});
 	await asyncExecShell(
-		`GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git clone -q -b ${branch} https://x-access-token:${token}@${url}/${repository}.git ${workdir}/ && cd ${workdir} && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git submodule update --init --recursive && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git lfs pull && cd .. `
+		`GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git clone --recursive --jobs 3 -q -b ${branch} https://x-access-token:${token}@${url}/${repository}.git ${workdir}/ && cd ${workdir} && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git lfs pull && cd .. `
 	);
 	const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 	return commit.replace('\n', '');

src/lib/importers/gitlab.ts

@@ -31,7 +31,7 @@ export default async function ({
 	});
 
 	await asyncExecShell(
-		`GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git clone -q -b ${branch} git@${url}:${repository}.git --config core.sshCommand="ssh -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git submodule update --init --recursive && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git lfs pull && cd .. `
+		`GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git clone --recursive --jobs 3 -q -b ${branch} git@${url}:${repository}.git --config core.sshCommand="ssh -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git lfs pull && cd .. `
 	);
 	const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 	return commit.replace('\n', '');