From 75b37ea0dcc1dd797434e8d0860f9c354dd99477 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 27 Aug 2022 08:24:38 +0000 Subject: [PATCH 1/8] chore: version++ --- apps/api/src/lib/common.ts | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index d6e30aa03..c04e9ceac 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -19,7 +19,7 @@ import * as serviceFields from './serviceFields' import { saveBuildLog } from './buildPacks/common'; import { scheduler } from './scheduler'; -export const version = '3.8.4'; +export const version = '3.8.5'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/package.json b/package.json index 4e3a1d486..a6090a041 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.8.4", + "version": "3.8.5", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": { From 4d94106bffb301293c03554d22e6862261ae801c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 27 Aug 2022 10:22:03 +0000 Subject: [PATCH 2/8] fix: copy all files during install process --- apps/api/src/lib/buildPacks/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts index c66477a0b..466595658 100644 --- a/apps/api/src/lib/buildPacks/common.ts +++ b/apps/api/src/lib/buildPacks/common.ts @@ -672,7 +672,7 @@ export async function buildCacheImageWithNode(data, imageForBuild) { 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 ./`); + Dockerfile.push(`COPY .${baseDirectory || ''}/ ./`); Dockerfile.push(`RUN ${installCommand}`); } Dockerfile.push(`COPY .${baseDirectory || ''} ./`); From c003e56c03761508c5f5343dca1c7613f81dc0bb Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 27 Aug 2022 10:22:36 +0000 Subject: [PATCH 3/8] fix: typo --- apps/api/src/lib/buildPacks/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts index 466595658..3fcb80f2a 100644 --- a/apps/api/src/lib/buildPacks/common.ts +++ b/apps/api/src/lib/buildPacks/common.ts @@ -672,7 +672,7 @@ export async function buildCacheImageWithNode(data, imageForBuild) { Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } if (installCommand) { - Dockerfile.push(`COPY .${baseDirectory || ''}/ ./`); + Dockerfile.push(`COPY .${baseDirectory || ''} ./`); Dockerfile.push(`RUN ${installCommand}`); } Dockerfile.push(`COPY .${baseDirectory || ''} ./`); From f9932f9fee381d9e312a63937d46b3f6ada3794d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 27 Aug 2022 10:22:58 +0000 Subject: [PATCH 4/8] fix: process --- apps/api/src/lib/buildPacks/common.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts index 3fcb80f2a..97bfb6fb9 100644 --- a/apps/api/src/lib/buildPacks/common.ts +++ b/apps/api/src/lib/buildPacks/common.ts @@ -671,11 +671,10 @@ export async function buildCacheImageWithNode(data, imageForBuild) { if (isPnpm) { Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } + Dockerfile.push(`COPY .${baseDirectory || ''} ./`); if (installCommand) { - Dockerfile.push(`COPY .${baseDirectory || ''} ./`); Dockerfile.push(`RUN ${installCommand}`); } - Dockerfile.push(`COPY .${baseDirectory || ''} ./`); Dockerfile.push(`RUN ${buildCommand}`); await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n')); await buildImage({ ...data, isCache: true }); From d61187c83682ea27769f01db0beb26cdb88ef409 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 27 Aug 2022 10:30:07 +0000 Subject: [PATCH 5/8] fix: white labeled icon on navbar --- apps/ui/src/routes/__layout.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/ui/src/routes/__layout.svelte b/apps/ui/src/routes/__layout.svelte index e808f555a..f6c5e8b28 100644 --- a/apps/ui/src/routes/__layout.svelte +++ b/apps/ui/src/routes/__layout.svelte @@ -121,6 +121,10 @@
{#if !$appSession.whiteLabeled}
coolLabs logo
+ {:else if $appSession.whiteLabeledDetails.icon} +
+ White labeled logo +
{/if}
Date: Sat, 27 Aug 2022 10:33:03 +0000 Subject: [PATCH 6/8] fix: whitelabeled icon --- apps/ui/src/routes/__layout.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/ui/src/routes/__layout.svelte b/apps/ui/src/routes/__layout.svelte index f6c5e8b28..0be33466c 100644 --- a/apps/ui/src/routes/__layout.svelte +++ b/apps/ui/src/routes/__layout.svelte @@ -120,9 +120,11 @@