From 523004e5b29832a911128d628b3318c80699d918 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 28 Sep 2022 10:54:57 +0200 Subject: [PATCH 1/5] 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 6f819433e..d9cb80a58 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -21,7 +21,7 @@ import { scheduler } from './scheduler'; import { supportedServiceTypesAndVersions } from './services/supportedVersions'; import { includeServices } from './services/common'; -export const version = '3.10.10'; +export const version = '3.10.11'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/package.json b/package.json index 386613892..12a7d4a11 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.10.10", + "version": "3.10.11", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": { From 2105b1e7c41c61a652f9a8097a30dc466e298a3f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 28 Sep 2022 10:55:08 +0200 Subject: [PATCH 2/5] ux: hasura console notification --- apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte b/apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte index 0c5403c7b..19ca04925 100644 --- a/apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte +++ b/apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte @@ -19,6 +19,7 @@ disabled /> +
Hasura Console is not enabled by default for security reasons.
To enable it, add the following secret:

HASURA_GRAPHQL_ENABLE_CONSOLE=true
PostgreSQL
From 5c69ff33390c04de807b8b8f84baba5edc3b97fd Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 28 Sep 2022 10:59:58 +0200 Subject: [PATCH 3/5] fix: do not get status of more than 10 resources defined by category --- apps/ui/src/routes/index.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte index b8e2fa2f7..03584247a 100644 --- a/apps/ui/src/routes/index.svelte +++ b/apps/ui/src/routes/index.svelte @@ -127,15 +127,15 @@ async function getStatus(resources: any, force: boolean = false) { const { id, buildPack, dualCerts, type } = resources; - if (buildPack && applications.length > 10 && !force) { + if (buildPack && applications.length + filtered.otherApplications.length > 10 && !force) { noInitialStatus.applications = true; return; } - if (type && services.length > 10 && !force) { + if (type && services.length + filtered.otherServices.length > 10 && !force) { noInitialStatus.services = true; return; } - if (databases.length > 10 && !force) { + if (databases.length + filtered.otherDatabases.length > 10 && !force) { noInitialStatus.databases = true; return; } From 436bd7378615228b940d1abd24855b93441fe058 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 28 Sep 2022 11:14:23 +0200 Subject: [PATCH 4/5] fix: baseDirectory --- .../src/routes/applications/[id]/index.svelte | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte index 39740157f..5e4b3f2bf 100644 --- a/apps/ui/src/routes/applications/[id]/index.svelte +++ b/apps/ui/src/routes/applications/[id]/index.svelte @@ -759,27 +759,32 @@ {/if} {#if application.buildPack === 'docker'}
-
- -
- + class="w-full input" + disabled={isDisabled} + readonly={!$appSession.isAdmin} + name="dockerFileLocation" + id="dockerFileLocation" + bind:value={application.dockerFileLocation} + placeholder="default: /Dockerfile" + /> + {#if application?.baseDirectory} + + {/if} +
{/if} {#if !notNodeDeployments.includes(application.buildPack)} From 60a033f93a7a8046ab22e79884304c2f864d8b4a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 28 Sep 2022 11:16:35 +0200 Subject: [PATCH 5/5] ui: fix --- apps/ui/src/routes/applications/[id]/index.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte index 5e4b3f2bf..5f09c7db6 100644 --- a/apps/ui/src/routes/applications/[id]/index.svelte +++ b/apps/ui/src/routes/applications/[id]/index.svelte @@ -759,7 +759,7 @@ {/if} {#if application.buildPack === 'docker'}
- - {#if application?.baseDirectory} + {#if application.baseDirectory}