From f6a91cb53c4db5f4f1a4b3b5cd67d03a46f621c8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 1 Apr 2022 00:07:29 +0200 Subject: [PATCH 1/3] fix: Haproxy errors --- package.json | 2 +- src/lib/haproxy/configuration.ts | 7 +------ src/lib/haproxy/index.ts | 6 +----- src/lib/queues/proxy.ts | 1 - 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 463479001..6c7237198 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "2.2.6", + "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", diff --git a/src/lib/haproxy/configuration.ts b/src/lib/haproxy/configuration.ts index 70e6502fc..120e2d4cd 100644 --- a/src/lib/haproxy/configuration.ts +++ b/src/lib/haproxy/configuration.ts @@ -138,12 +138,7 @@ export async function haproxyInstance() { export async function configureHAProxy() { const haproxy = await haproxyInstance(); - - try { - await checkHAProxy(haproxy); - } catch (error) { - return 'Error: HAProxy is not running'; - } + await checkHAProxy(haproxy); try { const data = { diff --git a/src/lib/haproxy/index.ts b/src/lib/haproxy/index.ts index 39190384d..c1d65f10c 100644 --- a/src/lib/haproxy/index.ts +++ b/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); - } catch (error) { - return 'Error: HAProxy is not running'; - } + await checkHAProxy(haproxy); let transactionId; try { diff --git a/src/lib/queues/proxy.ts b/src/lib/queues/proxy.ts index a29b2a223..339e60d60 100644 --- a/src/lib/queues/proxy.ts +++ b/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); } } From dcf7f92aabc8a01aac9896c192b691b4924ee8da Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 1 Apr 2022 14:29:06 +0200 Subject: [PATCH 2/3] fix: Build variables --- src/lib/buildPacks/docker.ts | 4 ++-- src/lib/buildPacks/nextjs.ts | 4 ++-- src/lib/buildPacks/node.ts | 4 ++-- src/lib/buildPacks/nuxtjs.ts | 4 ++-- src/lib/buildPacks/static.ts | 4 ++-- src/lib/docker.ts | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/buildPacks/docker.ts b/src/lib/buildPacks/docker.ts index 2c86bb532..371ffed82 100644 --- a/src/lib/buildPacks/docker.ts +++ b/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}`); } } } diff --git a/src/lib/buildPacks/nextjs.ts b/src/lib/buildPacks/nextjs.ts index 4f1f3b0d6..0f58b3b84 100644 --- a/src/lib/buildPacks/nextjs.ts +++ b/src/lib/buildPacks/nextjs.ts @@ -23,11 +23,11 @@ const createDockerfile = async (data, image): Promise => { 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}`); } } } diff --git a/src/lib/buildPacks/node.ts b/src/lib/buildPacks/node.ts index 54527a728..869e28b5d 100644 --- a/src/lib/buildPacks/node.ts +++ b/src/lib/buildPacks/node.ts @@ -24,11 +24,11 @@ const createDockerfile = async (data, image): Promise => { 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}`); } } } diff --git a/src/lib/buildPacks/nuxtjs.ts b/src/lib/buildPacks/nuxtjs.ts index 207afe864..bfa48bf73 100644 --- a/src/lib/buildPacks/nuxtjs.ts +++ b/src/lib/buildPacks/nuxtjs.ts @@ -23,11 +23,11 @@ const createDockerfile = async (data, image): Promise => { 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}`); } } } diff --git a/src/lib/buildPacks/static.ts b/src/lib/buildPacks/static.ts index 17900ced3..e9e7179d5 100644 --- a/src/lib/buildPacks/static.ts +++ b/src/lib/buildPacks/static.ts @@ -22,11 +22,11 @@ const createDockerfile = async (data, image): Promise => { 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}`); } } } diff --git a/src/lib/docker.ts b/src/lib/docker.ts index 717303040..89290fba2 100644 --- a/src/lib/docker.ts +++ b/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}`); } } } From 4e334d4fff777c078181fad9b4f310ac453ec5c0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 1 Apr 2022 14:41:38 +0200 Subject: [PATCH 3/3] fix: Use NodeJS for sveltekit for now --- src/lib/components/templates.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/components/templates.ts b/src/lib/components/templates.ts index 1b2e7346d..5ad62f6fa 100644 --- a/src/lib/components/templates.ts +++ b/src/lib/components/templates.ts @@ -252,6 +252,9 @@ export const buildPacks = [ } ]; export const scanningTemplates = { + '@sveltejs/kit': { + buildPack: 'nodejs' + }, astro: { buildPack: 'astro' },