From e6d13cb7d75cc744192ac0afa5e609c082d0c4df Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 13 Dec 2022 21:29:42 +0100 Subject: [PATCH 1/4] Update --bug-report.yaml --- .github/ISSUE_TEMPLATE/--bug-report.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/--bug-report.yaml b/.github/ISSUE_TEMPLATE/--bug-report.yaml index 53853d157..c44e7508d 100644 --- a/.github/ISSUE_TEMPLATE/--bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/--bug-report.yaml @@ -9,13 +9,21 @@ body: - type: markdown attributes: value: | - Thanks for taking the time to fill out this bug report! Please fill the form in English + Thanks for taking the time to fill out this bug report! Please fill the form in English. - type: checkboxes attributes: label: Is there an existing issue for this? options: - label: I have searched the existing issues required: true +- type: input + id: repository + attributes: + label: Example public repository + description: "An example public git repository to reproduce the issue easily (if applicable)." + placeholder: "https://github.com/coollabsio/coolify" + validations: + required: false - type: textarea attributes: label: Description From 2358510cba8568f11e0cde51f670f14bc176adf7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 13 Dec 2022 21:30:52 +0100 Subject: [PATCH 2/4] Update --bug-report.yaml --- .github/ISSUE_TEMPLATE/--bug-report.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/--bug-report.yaml b/.github/ISSUE_TEMPLATE/--bug-report.yaml index c44e7508d..65f2ed40d 100644 --- a/.github/ISSUE_TEMPLATE/--bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/--bug-report.yaml @@ -21,7 +21,7 @@ body: attributes: label: Example public repository description: "An example public git repository to reproduce the issue easily (if applicable)." - placeholder: "https://github.com/coollabsio/coolify" + placeholder: "ex: https://github.com/coollabsio/coolify" validations: required: false - type: textarea From b2e048de8dcdecd4a630c6c9b760d2c9fe6f0e57 Mon Sep 17 00:00:00 2001 From: Tiago Braga Date: Sat, 24 Dec 2022 16:27:10 -0300 Subject: [PATCH 3/4] Fix: conditional on environment --- apps/api/src/lib/buildPacks/compose.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts index 3f2bd5878..9819db1af 100644 --- a/apps/api/src/lib/buildPacks/compose.ts +++ b/apps/api/src/lib/buildPacks/compose.ts @@ -2,6 +2,8 @@ import { promises as fs } from 'fs'; import { defaultComposeConfiguration, executeCommand, generateSecrets } from '../common'; import { saveBuildLog } from './common'; import yaml from 'js-yaml'; +import { exit } from 'process'; +import fastify from 'fastify'; export default async function (data) { let { @@ -43,7 +45,8 @@ export default async function (data) { let networks = {}; for (let [key, value] of Object.entries(dockerComposeYaml.services)) { value['container_name'] = `${applicationId}-${key}`; - value['environment'] = [...value['environment'], ...envs]; + let environment = typeof value['environment'] === 'undefined' ? [] : value['environment'] + value['environment'] = [...environment, ...envs]; value['labels'] = labels; // TODO: If we support separated volume for each service, we need to add it here if (value['volumes']?.length > 0) { From ce4a2d95f2d29f94dc74added74bd243b96ba38a Mon Sep 17 00:00:00 2001 From: Tiago Braga Date: Sat, 24 Dec 2022 16:28:02 -0300 Subject: [PATCH 4/4] fix: remove unused imports --- apps/api/src/lib/buildPacks/compose.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts index 9819db1af..c8cbc9f16 100644 --- a/apps/api/src/lib/buildPacks/compose.ts +++ b/apps/api/src/lib/buildPacks/compose.ts @@ -2,8 +2,6 @@ import { promises as fs } from 'fs'; import { defaultComposeConfiguration, executeCommand, generateSecrets } from '../common'; import { saveBuildLog } from './common'; import yaml from 'js-yaml'; -import { exit } from 'process'; -import fastify from 'fastify'; export default async function (data) { let {