From 6db47def8ed2b0ef18df046dec4dad992d37c3eb Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 26 Sep 2022 18:48:22 +0000 Subject: [PATCH 1/6] fix: service logs --- apps/ui/src/routes/services/[id]/logs/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ui/src/routes/services/[id]/logs/index.svelte b/apps/ui/src/routes/services/[id]/logs/index.svelte index 38fd6d254..4f6371849 100644 --- a/apps/ui/src/routes/services/[id]/logs/index.svelte +++ b/apps/ui/src/routes/services/[id]/logs/index.svelte @@ -152,7 +152,7 @@
{#each logs as log} -

{log.line + '\n'}

+

{log + '\n'}

{/each}
From 8b8566251e38c0e36b49f408ca82697d5fd9fb1c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 26 Sep 2022 18:49:05 +0000 Subject: [PATCH 2/6] 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 edc1377dd..b87fe4eef 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.7'; +export const version = '3.10.8'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/package.json b/package.json index 614321e62..a2e4cf306 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.7", + "version": "3.10.8", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": { From 3f5fd2395555d2494e6262da1b93261e376e73a8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 26 Sep 2022 18:57:24 +0000 Subject: [PATCH 3/6] ui: fix button --- apps/ui/src/routes/settings/coolify.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ui/src/routes/settings/coolify.svelte b/apps/ui/src/routes/settings/coolify.svelte index 88666c744..f1bf8467b 100644 --- a/apps/ui/src/routes/settings/coolify.svelte +++ b/apps/ui/src/routes/settings/coolify.svelte @@ -216,7 +216,7 @@ > {#if isFqdnSet} - {/if} From 552c7297bf7e137bfe51d1a9064baad4bb51ba3f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 26 Sep 2022 19:00:36 +0000 Subject: [PATCH 4/6] ui: service fixes --- .../routes/services/[id]/logs/index.svelte | 33 +---------------- .../src/routes/services/[id]/secrets.svelte | 3 -- .../src/routes/services/[id]/storages.svelte | 37 ------------------- 3 files changed, 1 insertion(+), 72 deletions(-) diff --git a/apps/ui/src/routes/services/[id]/logs/index.svelte b/apps/ui/src/routes/services/[id]/logs/index.svelte index 4f6371849..67e2312fe 100644 --- a/apps/ui/src/routes/services/[id]/logs/index.svelte +++ b/apps/ui/src/routes/services/[id]/logs/index.svelte @@ -84,37 +84,6 @@ } -
-
-
- Service Logs -
- {service.name} -
- - {#if service.fqdn} - - - - - - - {/if} -
{#if logs.length === 0}
{$t('application.build.waiting_logs')}
@@ -150,7 +119,7 @@ Follow Logs
-
+
{#each logs as log}

{log + '\n'}

{/each} diff --git a/apps/ui/src/routes/services/[id]/secrets.svelte b/apps/ui/src/routes/services/[id]/secrets.svelte index 3211804cc..e9c390e43 100644 --- a/apps/ui/src/routes/services/[id]/secrets.svelte +++ b/apps/ui/src/routes/services/[id]/secrets.svelte @@ -69,9 +69,6 @@
-

- Secrets -

diff --git a/apps/ui/src/routes/services/[id]/storages.svelte b/apps/ui/src/routes/services/[id]/storages.svelte index ee95583a5..b378ad3ae 100644 --- a/apps/ui/src/routes/services/[id]/storages.svelte +++ b/apps/ui/src/routes/services/[id]/storages.svelte @@ -35,43 +35,6 @@ } -
-
-
- Persistent Storage -
- {service.name} -
- {#if service.fqdn} - - - - - - - {/if} - - -
-
Date: Mon, 26 Sep 2022 19:20:41 +0000 Subject: [PATCH 5/6] fix: appwrite function network is not the default --- apps/api/src/lib/services/handlers.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/apps/api/src/lib/services/handlers.ts b/apps/api/src/lib/services/handlers.ts index 227383f9a..e951004fa 100644 --- a/apps/api/src/lib/services/handlers.ts +++ b/apps/api/src/lib/services/handlers.ts @@ -1430,6 +1430,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_EXECUTOR_HOST=http://${id}-executor/v1`, `_APP_STATSD_HOST=${id}-telegraf`, "_APP_STATSD_PORT=8125", + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1453,6 +1454,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_SCHEMA=${mariadbDatabase}`, `_APP_DB_USER=${mariadbUser}`, `_APP_DB_PASS=${mariadbPassword}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1476,6 +1478,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_SCHEMA=${mariadbDatabase}`, `_APP_DB_USER=${mariadbUser}`, `_APP_DB_PASS=${mariadbPassword}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1494,6 +1497,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_OPENSSL_KEY_V1=${opensslKeyV1}`, `_APP_REDIS_HOST=${id}-redis`, "_APP_REDIS_PORT=6379", + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1527,6 +1531,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_PASS=${mariadbPassword}`, `_APP_EXECUTOR_SECRET=${executorSecret}`, `_APP_EXECUTOR_HOST=http://${id}-executor/v1`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1550,6 +1555,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_SCHEMA=${mariadbDatabase}`, `_APP_DB_USER=${mariadbUser}`, `_APP_DB_PASS=${mariadbPassword}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1575,6 +1581,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_SCHEMA=${mariadbDatabase}`, `_APP_DB_USER=${mariadbUser}`, `_APP_DB_PASS=${mariadbPassword}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1604,6 +1611,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_SCHEMA=${mariadbDatabase}`, `_APP_DB_USER=${mariadbUser}`, `_APP_DB_PASS=${mariadbPassword}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1630,6 +1638,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_PASS=${mariadbPassword}`, `_APP_EXECUTOR_SECRET=${executorSecret}`, `_APP_EXECUTOR_HOST=http://${id}-executor/v1`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1654,6 +1663,7 @@ async function startAppWriteService(request: FastifyRequest) { environment: [ "_APP_ENV=production", `_APP_EXECUTOR_SECRET=${executorSecret}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1671,6 +1681,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_OPENSSL_KEY_V1=${opensslKeyV1}`, `_APP_REDIS_HOST=${id}-redis`, "_APP_REDIS_PORT=6379", + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1687,6 +1698,7 @@ async function startAppWriteService(request: FastifyRequest) { "_APP_ENV=production", `_APP_REDIS_HOST=${id}-redis`, "_APP_REDIS_PORT=6379", + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1711,6 +1723,7 @@ async function startAppWriteService(request: FastifyRequest) { `_APP_DB_SCHEMA=${mariadbDatabase}`, `_APP_DB_USER=${mariadbUser}`, `_APP_DB_PASS=${mariadbPassword}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1727,6 +1740,7 @@ async function startAppWriteService(request: FastifyRequest) { "_APP_ENV=production", `_APP_REDIS_HOST=${id}-redis`, "_APP_REDIS_PORT=6379", + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1743,7 +1757,8 @@ async function startAppWriteService(request: FastifyRequest) { `MYSQL_ROOT_PASSWORD=${mariadbRootUserPassword}`, `MYSQL_USER=${mariadbUser}`, `MYSQL_PASSWORD=${mariadbPassword}`, - `MYSQL_DATABASE=${mariadbDatabase}` + `MYSQL_DATABASE=${mariadbDatabase}`, + `OPEN_RUNTIMES_NETWORK=${network}`, ], command: "mysqld --innodb-flush-method=fsync", ...defaultComposeConfiguration(network), @@ -1781,6 +1796,7 @@ async function startAppWriteService(request: FastifyRequest) { "_APP_INFLUXDB_PORT=8086", `_APP_REDIS_HOST=${id}-redis`, "_APP_REDIS_PORT=6379", + `OPEN_RUNTIMES_NETWORK=${network}`, ...secrets ], ...defaultComposeConfiguration(network), @@ -1799,6 +1815,7 @@ async function startAppWriteService(request: FastifyRequest) { environment: [ `_APP_INFLUXDB_HOST=${id}-influxdb`, "_APP_INFLUXDB_PORT=8086", + `OPEN_RUNTIMES_NETWORK=${network}`, ], ...defaultComposeConfiguration(network), } From 7bc2299a8ea84f21be40b7e1b60bbd1de26ca430 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 26 Sep 2022 19:24:13 +0000 Subject: [PATCH 6/6] rename grafana dashboard to grafana --- apps/api/src/lib/services/supportedVersions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/src/lib/services/supportedVersions.ts b/apps/api/src/lib/services/supportedVersions.ts index 526f49379..485e89ecf 100644 --- a/apps/api/src/lib/services/supportedVersions.ts +++ b/apps/api/src/lib/services/supportedVersions.ts @@ -235,7 +235,7 @@ export const supportedServiceTypesAndVersions = [ // }, { name: 'grafana', - fancyName: 'Grafana Dashboard', + fancyName: 'Grafana', baseImage: 'grafana/grafana', images: [], versions: ['latest', '9.1.3', '9.1.2', '9.0.8', '8.3.11', '8.4.11', '8.5.11'],