Merge pull request #446 from coollabsio/next

v2.9.6

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.9.0",
+	"version": "2.9.6",
 	"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

@@ -5,6 +5,12 @@ const prisma = new PrismaClient();
 const crypto = require('crypto');
 const generator = require('generate-password');
 const cuid = require('cuid');
+const compare = require('compare-versions');
+const { version } = require('../package.json');
+const child = require('child_process');
+const util = require('util');
+
+const algorithm = 'aes-256-ctr';
 
 function generatePassword(length = 24) {
 	return generator.generate({
@@ -13,7 +19,7 @@ function generatePassword(length = 24) {
 		strict: true
 	});
 }
-const algorithm = 'aes-256-ctr';
+const asyncExecShell = util.promisify(child.exec);
 
 async function main() {
 	// Enable registration for the first user
@@ -64,6 +70,56 @@ async function main() {
 			}
 		});
 	}
+	if (settings.isTraefikUsed) {
+		// Force stop Coolify Proxy, as it had a bug in < 2.9.2. TrustProxy + api.insecure
+		try {
+			const { stdout } = await asyncExecShell(
+				`docker inspect coolify-proxy --format '{{json .Config.Cmd}}'`
+			);
+			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 \
+				-v /var/run/docker.sock:/var/run/docker.sock \
+				--network coolify-infra \
+				-p "80:80" \
+				-p "443:443" \
+				--name coolify-proxy \
+				-d traefik:v2.6 \
+				--entrypoints.web.address=:80 \
+				--entrypoints.web.forwardedHeaders.insecure=true \
+				--entrypoints.websecure.address=:443 \
+				--entrypoints.websecure.forwardedHeaders.insecure=true \
+				--providers.docker=true \
+				--providers.docker.exposedbydefault=false \
+				--providers.http.endpoint=http://coolify:3000/webhooks/traefik/main.json \
+				--providers.http.pollTimeout=5s \
+				--certificatesresolvers.letsencrypt.acme.httpchallenge=true \
+				--certificatesresolvers.letsencrypt.acme.storage=/etc/traefik/acme/acme.json \
+				--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web \
+				--log.level=error`
+				);
+			}
+		} catch (error) {
+			console.log(error);
+		}
+	}
 }
 main()
 	.catch((e) => {

src/lib/buildPacks/nestjs.ts

@@ -10,8 +10,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (isPnpm) {
-		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
-		Dockerfile.push('RUN pnpm add -g pnpm');
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${baseDirectory || ''} ./`);
 

src/lib/buildPacks/nextjs.ts

@@ -35,8 +35,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		});
 	}
 	if (isPnpm) {
-		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
-		Dockerfile.push('RUN pnpm add -g pnpm');
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
 	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);

src/lib/buildPacks/node.ts

@@ -36,8 +36,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		});
 	}
 	if (isPnpm) {
-		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
-		Dockerfile.push('RUN pnpm add -g pnpm');
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
 	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);

src/lib/buildPacks/nuxtjs.ts

@@ -35,8 +35,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		});
 	}
 	if (isPnpm) {
-		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
-		Dockerfile.push('RUN pnpm add -g pnpm');
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
 	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);

src/lib/database/gitSources.ts

@@ -67,16 +67,10 @@ export async function getSource({
 	return body;
 }
 export async function addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl, organization }) {
-	await prisma.gitSource.update({
+	return await prisma.gitSource.update({
 		where: { id },
 		data: { type, name, htmlUrl, apiUrl, organization }
 	});
-	return await prisma.githubApp.create({
-		data: {
-			teams: { connect: { id: teamId } },
-			gitSource: { connect: { id } }
-		}
-	});
 }
 export async function addGitLabSource({
 	id,

src/lib/docker.ts

@@ -66,8 +66,7 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 		});
 	}
 	if (isPnpm) {
-		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
-		Dockerfile.push('RUN pnpm add -g pnpm');
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
 	if (installCommand) {
 		Dockerfile.push(`COPY .${baseDirectory || ''}/package.json ./`);

src/lib/haproxy/index.ts

@@ -161,6 +161,7 @@ export async function startTraefikTCPProxy(
 						image: 'traefik:v2.6',
 						command: [
 							`--entrypoints.tcp.address=:${publicPort}`,
+							`--entryPoints.tcp.forwardedHeaders.insecure=true`,
 							`--providers.http.endpoint=${otherTraefikEndpoint}?id=${id}&privatePort=${privatePort}&publicPort=${publicPort}&type=tcp&address=${dependentId}`,
 							'--providers.http.pollTimeout=2s',
 							'--log.level=error'
@@ -257,6 +258,7 @@ export async function startTraefikHTTPProxy(
 						image: 'traefik:v2.6',
 						command: [
 							`--entrypoints.http.address=:${publicPort}`,
+							`--entryPoints.http.forwardedHeaders.insecure=true`,
 							`--providers.http.endpoint=${otherTraefikEndpoint}?id=${id}&privatePort=${privatePort}&publicPort=${publicPort}&type=http`,
 							'--providers.http.pollTimeout=2s',
 							'--certificatesresolvers.letsencrypt.acme.httpchallenge=true',
@@ -368,12 +370,12 @@ export async function startTraefikProxy(engine: string): Promise<void> {
 			--network coolify-infra \
 			-p "80:80" \
 			-p "443:443" \
-			-p "8080:8080" \
 			--name coolify-proxy \
 			-d ${defaultTraefikImage} \
-			--api.insecure=true \
 			--entrypoints.web.address=:80 \
+			--entrypoints.web.forwardedHeaders.insecure=true \
 			--entrypoints.websecure.address=:443 \
+			--entrypoints.websecure.forwardedHeaders.insecure=true \
 			--providers.docker=true \
 			--providers.docker.exposedbydefault=false \
 			--providers.http.endpoint=${mainTraefikEndpoint} \

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 submodule update --init --recursive && git lfs pull && cd .. `
+		`git clone -q -b ${branch} https://x-access-token:${token}@${url}/${repository}.git ${workdir}/ && cd ${workdir} && git submodule update --init --recursive && 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 submodule update --init --recursive && git lfs pull && cd .. `
+		`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 submodule update --init --recursive && git lfs pull && cd .. `
 	);
 	const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 	return commit.replace('\n', '');

src/routes/applications/[id]/index.svelte

@@ -102,7 +102,7 @@
 	onMount(async () => {
 		if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
 			application.fqdn = `http://${cuid()}.demo.coolify.io`;
-			await post(`/applications/${id}.json`, { ...application });
+			await handleSubmit();
 		}
 		domainEl.focus();
 		await getUsage();

src/routes/databases/[id]/delete.json.ts

@@ -12,7 +12,7 @@ export const del: RequestHandler = async (event) => {
 		const database = await db.getDatabase({ id, teamId });
 		if (database.destinationDockerId) {
 			const everStarted = await stopDatabase(database);
-			if (everStarted) await stopTcpHttpProxy(database.destinationDocker, database.publicPort);
+			if (everStarted) await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort);
 		}
 		await db.removeDatabase({ id });
 		return { status: 200 };

src/routes/databases/[id]/settings.json.ts

@@ -29,7 +29,7 @@ export const post: RequestHandler = async (event) => {
 				}
 			} else {
 				await db.prisma.database.update({ where: { id }, data: { publicPort: null } });
-				await stopTcpHttpProxy(destinationDocker, oldPublicPort);
+				await stopTcpHttpProxy(id, destinationDocker, oldPublicPort);
 			}
 		}
 		return {

src/routes/databases/[id]/stop.json.ts

@@ -13,7 +13,7 @@ export const post: RequestHandler = async (event) => {
 	try {
 		const database = await db.getDatabase({ id, teamId });
 		const everStarted = await stopDatabase(database);
-		if (everStarted) await stopTcpHttpProxy(database.destinationDocker, database.publicPort);
+		if (everStarted) await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort);
 		await db.setDatabase({ id, isPublic: false });
 		await db.prisma.database.update({ where: { id }, data: { publicPort: null } });
 
@@ -21,6 +21,7 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
+		console.log(error);
 		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/_Services/_Services.svelte

@@ -74,7 +74,23 @@
 	onMount(async () => {
 		if (browser && window.location.hostname === 'demo.coolify.io' && !service.fqdn) {
 			service.fqdn = `http://${cuid()}.demo.coolify.io`;
-			await post(`/services/${id}/${service.type}.json`, { ...service });
+			if (service.type === 'wordpress') {
+				service.wordpress.mysqlDatabase = 'db';
+			}
+			if (service.type === 'plausibleanalytics') {
+				service.plausibleAnalytics.email = 'noreply@demo.com';
+				service.plausibleAnalytics.username = 'admin';
+			}
+			if (service.type === 'minio') {
+				service.minio.apiFqdn = `http://${cuid()}.demo.coolify.io`;
+			}
+			if (service.type === 'ghost') {
+				service.ghost.mariadbDatabase = 'db';
+			}
+			if (service.type === 'fider') {
+				service.fider.emailNoreply = 'noreply@demo.com';
+			}
+			await handleSubmit();
 		}
 	});
 </script>

src/routes/services/[id]/fider/start.json.ts

@@ -59,7 +59,7 @@ export const post: RequestHandler = async (event) => {
 			fider: {
 				image: `${image}:${version}`,
 				environmentVariables: {
-					HOST_DOMAIN: domain,
+					BASE_URL: domain,
 					DATABASE_URL: `postgresql://${postgresqlUser}:${postgresqlPassword}@${id}-postgresql:5432/${postgresqlDatabase}?sslmode=disable`,
 					JWT_SECRET: `${jwtSecret.replace(/\$/g, '$$$')}`,
 					EMAIL_NOREPLY: emailNoreply,

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

@@ -80,7 +80,7 @@
 </script>
 
 <div class="mx-auto max-w-4xl px-6">
-	{#if !source.githubApp?.installationId}
+	{#if !source.githubAppId}
 		<form on:submit|preventDefault={newGithubApp} class="py-4">
 			<div class="flex space-x-1 pb-5 font-bold">
 				<div class="title">General</div>
@@ -171,7 +171,7 @@
 		</form>
 	{:else}
 		<div class="text-center">
-			<button class=" bg-orange-600 mt-8" on:click={() => installRepositories(source)}
+			<button class=" mt-8 bg-orange-600" on:click={() => installRepositories(source)}
 				>Install Repositories</button
 			>
 		</div>

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

@@ -113,7 +113,7 @@
 </div>
 
 <div class="flex flex-col justify-center">
-	{#if !source.gitlabAppId && (!source.githubAppId || !source.githubApp?.installationId)}
+	{#if !source.gitlabAppId && !source.githubAppId}
 		<div class="flex-col space-y-2 pb-10 text-center">
 			<div class="text-xl font-bold text-white">Select a provider</div>
 			<div class="flex justify-center space-x-2">

src/routes/update.json.ts

@@ -6,7 +6,6 @@ import * as db from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 import compare from 'compare-versions';
 import got from 'got';
-import { checkContainer, startCoolifyProxy, startTraefikProxy } from '$lib/haproxy';
 
 export const get: RequestHandler = async (request) => {
 	try {