From ae2d3ebb48b857a2983a2668e11ac759af745a80 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 11 Nov 2022 09:25:02 +0100 Subject: [PATCH] fix: no tags error --- apps/api/src/lib/common.ts | 2 +- apps/api/src/lib/services.ts | 25 +++++++++------ apps/api/src/lib/services/handlers.ts | 4 +-- .../routes/services/[id]/_ServiceLinks.svelte | 2 +- apps/ui/src/routes/services/[id]/index.svelte | 31 +++++++++++-------- package.json | 2 +- 6 files changed, 39 insertions(+), 27 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index e2afeb3e5..352df307e 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -17,7 +17,7 @@ import { day } from './dayjs'; import { saveBuildLog } from './buildPacks/common'; import { scheduler } from './scheduler'; -export const version = '3.11.5'; +export const version = '3.11.6'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/apps/api/src/lib/services.ts b/apps/api/src/lib/services.ts index df3c44e54..17086fa8a 100644 --- a/apps/api/src/lib/services.ts +++ b/apps/api/src/lib/services.ts @@ -22,15 +22,22 @@ const compareSemanticVersions = (a: string, b: string) => { return b1.length - a1.length; }; export async function getTags(type: string) { - if (type) { - const tagsPath = isDev ? './tags.json' : '/app/tags.json'; - const data = await fs.readFile(tagsPath, 'utf8') - let tags = JSON.parse(data) - if (tags) { - tags = tags.find((tag: any) => tag.name.includes(type)) - tags.tags = tags.tags.sort(compareSemanticVersions).reverse(); - return tags + + try { + if (type) { + const tagsPath = isDev ? './tags.json' : '/app/tags.json'; + const data = await fs.readFile(tagsPath, 'utf8') + let tags = JSON.parse(data) + if (tags) { + tags = tags.find((tag: any) => tag.name.includes(type)) + tags.tags = tags.tags.sort(compareSemanticVersions).reverse(); + return tags + } } + } catch (error) { + return [] + } - return [] + + } diff --git a/apps/api/src/lib/services/handlers.ts b/apps/api/src/lib/services/handlers.ts index 56ffb2e1f..f0be78133 100644 --- a/apps/api/src/lib/services/handlers.ts +++ b/apps/api/src/lib/services/handlers.ts @@ -34,7 +34,8 @@ export async function startService(request: FastifyRequest, fa const { id } = request.params; const teamId = request.user.teamId; const service = await getServiceFromDB({ id, teamId }); - const arm = isARM(process.arch); + console.log({service}) + const arm = isARM(service.arch); const { type, destinationDockerId, destinationDocker, persistentStorage, exposePort } = service; @@ -128,7 +129,6 @@ export async function startService(request: FastifyRequest, fa labels: makeLabelForServices(type), ...defaultComposeConfiguration(network), } - console.log(config[s].image) // Generate files for builds if (template.services[s]?.files?.length > 0) { diff --git a/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte b/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte index 63e5c06a5..f9f456f4d 100644 --- a/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte +++ b/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte @@ -8,7 +8,7 @@ {#if linkToDocs} - + {:else} {/if} diff --git a/apps/ui/src/routes/services/[id]/index.svelte b/apps/ui/src/routes/services/[id]/index.svelte index 70e97800c..f36275809 100644 --- a/apps/ui/src/routes/services/[id]/index.svelte +++ b/apps/ui/src/routes/services/[id]/index.svelte @@ -276,20 +276,25 @@
-
- +
+ {:else} + + {/if}
+
diff --git a/package.json b/package.json index 97e2f6861..da5db2f7f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.11.5", + "version": "3.11.6", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": {