Merge pull request #290 from coollabsio/v2.3.3

v2.3.3

Dockerfile

@@ -11,7 +11,7 @@ WORKDIR /app
 
 LABEL coolify.managed true
 
-RUN apk add --no-cache git openssh-client curl jq cmake sqlite
+RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite
 
 RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
 RUN pnpm add -g pnpm

package.json

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

src/lib/buildPacks/common.ts

@@ -124,18 +124,7 @@ export const setDefaultConfiguration = async (data) => {
 
 export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId) {
 	try {
-		// TODO: Write full .dockerignore for all deployments!!
 		if (buildPack === 'php') {
-			await fs.writeFile(
-				`${workdir}/.htaccess`,
-				`
-        RewriteEngine On
-        RewriteBase /
-        RewriteCond %{REQUEST_FILENAME} !-d
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteRule ^(.+)$ index.php [QSA,L]
-        `
-			);
 			await fs.writeFile(`${workdir}/entrypoint.sh`, `chown -R 1000 /app`);
 			await saveBuildLog({
 				line: 'Copied default configuration file for PHP.',

src/lib/buildPacks/php.ts

@@ -1,23 +1,33 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
 
-const createDockerfile = async (data, image): Promise<void> => {
+const createDockerfile = async (data, image, htaccessFound): Promise<void> => {
 	const { workdir, baseDirectory } = data;
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.image=true`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`COPY .${baseDirectory || ''} /app`);
-	Dockerfile.push(`COPY /.htaccess .`);
+	if (htaccessFound) {
+		Dockerfile.push(`COPY .${baseDirectory || ''}/.htaccess ./`);
+	}
 	Dockerfile.push(`COPY /entrypoint.sh /opt/docker/provision/entrypoint.d/30-entrypoint.sh`);
 	Dockerfile.push(`EXPOSE 80`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
+	const { workdir, baseDirectory } = data;
 	try {
-		const image = 'webdevops/php-nginx';
-		await createDockerfile(data, image);
+		let htaccessFound = false;
+		try {
+			const d = await fs.readFile(`${workdir}${baseDirectory || ''}/.htaccess`);
+			htaccessFound = true;
+		} catch (e) {
+			//
+		}
+		const image = htaccessFound ? 'webdevops/php-apache' : 'webdevops/php-nginx';
+		await createDockerfile(data, image, htaccessFound);
 		await buildImage(data);
 	} catch (error) {
 		throw error;

src/lib/common.ts

@@ -46,11 +46,16 @@ const customConfig: Config = {
 export const version = currentVersion;
 export const asyncExecShell = util.promisify(child.exec);
 export const asyncSleep = (delay) => new Promise((resolve) => setTimeout(resolve, delay));
+
 export const sentry = Sentry;
 
 export const uniqueName = () => uniqueNamesGenerator(customConfig);
 
 export const saveBuildLog = async ({ line, buildId, applicationId }) => {
+	if (line.includes('ghs_')) {
+		const regex = /ghs_.*@/g;
+		line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
+	}
 	const addTimestamp = `${generateTimestamp()} ${line}`;
 	return await buildLogQueue.add(buildId, { buildId, line: addTimestamp, applicationId });
 };

src/lib/importers/github.ts

@@ -15,40 +15,35 @@ export default async function ({
 	branch,
 	buildId
 }): Promise<any> {
-	try {
-		const url = htmlUrl.replace('https://', '').replace('http://', '');
-		await saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
-		const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId });
-		const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, '');
+	const url = htmlUrl.replace('https://', '').replace('http://', '');
+	await saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
+	const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId });
+	const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, '');
 
-		const payload = {
-			iat: Math.round(new Date().getTime() / 1000),
-			exp: Math.round(new Date().getTime() / 1000 + 60),
-			iss: appId
-		};
-		const jwtToken = jsonwebtoken.sign(payload, githubPrivateKey, {
-			algorithm: 'RS256'
-		});
-		const { token } = await got
-			.post(`${apiUrl}/app/installations/${installationId}/access_tokens`, {
-				headers: {
-					Authorization: `Bearer ${jwtToken}`,
-					Accept: 'application/vnd.github.machine-man-preview+json'
-				}
-			})
-			.json();
-		await saveBuildLog({
-			line: `Cloning ${repository}:${branch} branch.`,
-			buildId,
-			applicationId
-		});
-		await asyncExecShell(
-			`git clone -q -b ${branch} https://x-access-token:${token}@${url}/${repository}.git ${workdir}/ && cd ${workdir} && git submodule update --init --recursive && cd ..`
-		);
-		const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
-		return commit.replace('\n', '');
-	} catch (error) {
-		console.log({ error });
-		return ErrorHandler(error);
-	}
+	const payload = {
+		iat: Math.round(new Date().getTime() / 1000),
+		exp: Math.round(new Date().getTime() / 1000 + 60),
+		iss: appId
+	};
+	const jwtToken = jsonwebtoken.sign(payload, githubPrivateKey, {
+		algorithm: 'RS256'
+	});
+	const { token } = await got
+		.post(`${apiUrl}/app/installations/${installationId}/access_tokens`, {
+			headers: {
+				Authorization: `Bearer ${jwtToken}`,
+				Accept: 'application/vnd.github.machine-man-preview+json'
+			}
+		})
+		.json();
+	await saveBuildLog({
+		line: `Cloning ${repository}:${branch} branch.`,
+		buildId,
+		applicationId
+	});
+	await asyncExecShell(
+		`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

@@ -22,7 +22,7 @@ export default async function ({
 	});
 
 	await asyncExecShell(
-		`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 && 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/lib/queues/builder.ts

@@ -61,7 +61,7 @@ export default async function (job) {
 	await asyncSleep(500);
 	await db.prisma.build.updateMany({
 		where: {
-			status: 'queued',
+			status: { in: ['queued', 'running'] },
 			id: { not: buildId },
 			applicationId,
 			createdAt: { lt: new Date(new Date().getTime() - 60 * 60 * 1000) }

src/lib/queues/index.ts

@@ -118,10 +118,14 @@ buildWorker.on('completed', async (job: Bullmq.Job) => {
 	try {
 		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
 	} catch (error) {
+		setTimeout(async () => {
+			await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
+		}, 1234);
 		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
 		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
+		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
 	}
 	return;
 });
@@ -130,10 +134,14 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 	try {
 		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
 	} catch (error) {
+		setTimeout(async () => {
+			await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
+		}, 1234);
 		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}`;
 		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
+		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
 	}
 	await saveBuildLog({
 		line: 'Failed to deploy!',

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

@@ -24,7 +24,9 @@ export const post: RequestHandler = async (event) => {
 		const config = {
 			image: `${image}:${version}`,
 			volume: `${id}-n8n:/root/.n8n`,
-			environmentVariables: {}
+			environmentVariables: {
+				WEBHOOK_URL: `${service.fqdn}`
+			}
 		};
 		if (serviceSecret.length > 0) {
 			serviceSecret.forEach((secret) => {