dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #264 from coollabsio/v2.2.7

Browse Source 
v2.2.7
This commit is contained in:
Andras Bacsai
2022-04-01 14:43:53 +02:00
committed by GitHub
parent 726fbbb52a 4e334d4fff
commit 986c5b7133
11 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

4
src/lib/buildPacks/docker.ts
View File

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

4
src/lib/buildPacks/nextjs.ts
View File

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

4
src/lib/buildPacks/node.ts
View File

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

4
src/lib/buildPacks/nuxtjs.ts
View File

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

4
src/lib/buildPacks/static.ts
View File

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

3
src/lib/components/templates.ts
View File

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

4
src/lib/docker.ts
View File

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

7
src/lib/haproxy/configuration.ts
View File

@@ -138,12 +138,7 @@ export async function haproxyInstance() {
export async function configureHAProxy() { export async function configureHAProxy() {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
await checkHAProxy(haproxy);
try {
await checkHAProxy(haproxy);
} catch (error) {
return 'Error: HAProxy is not running';
}
try { try {
const data = { const data = {

6
src/lib/haproxy/index.ts
View File

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

1
src/lib/queues/proxy.ts
View File

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