fix: no tags error

This commit is contained in:
Andras Bacsai 2022-11-11 09:25:02 +01:00
parent 3c94723b23
commit ae2d3ebb48
6 changed files with 39 additions and 27 deletions

View File

@ -17,7 +17,7 @@ import { day } from './dayjs';
import { saveBuildLog } from './buildPacks/common'; import { saveBuildLog } from './buildPacks/common';
import { scheduler } from './scheduler'; import { scheduler } from './scheduler';
export const version = '3.11.5'; export const version = '3.11.6';
export const isDev = process.env.NODE_ENV === 'development'; export const isDev = process.env.NODE_ENV === 'development';
const algorithm = 'aes-256-ctr'; const algorithm = 'aes-256-ctr';

View File

@ -22,15 +22,22 @@ const compareSemanticVersions = (a: string, b: string) => {
return b1.length - a1.length; return b1.length - a1.length;
}; };
export async function getTags(type: string) { export async function getTags(type: string) {
if (type) {
const tagsPath = isDev ? './tags.json' : '/app/tags.json'; try {
const data = await fs.readFile(tagsPath, 'utf8') if (type) {
let tags = JSON.parse(data) const tagsPath = isDev ? './tags.json' : '/app/tags.json';
if (tags) { const data = await fs.readFile(tagsPath, 'utf8')
tags = tags.find((tag: any) => tag.name.includes(type)) let tags = JSON.parse(data)
tags.tags = tags.tags.sort(compareSemanticVersions).reverse(); if (tags) {
return tags tags = tags.find((tag: any) => tag.name.includes(type))
tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
return tags
}
} }
} catch (error) {
return []
} }
return []
} }

View File

@ -34,7 +34,8 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
const { id } = request.params; const { id } = request.params;
const teamId = request.user.teamId; const teamId = request.user.teamId;
const service = await getServiceFromDB({ id, 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 } = const { type, destinationDockerId, destinationDocker, persistentStorage, exposePort } =
service; service;
@ -128,7 +129,6 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
labels: makeLabelForServices(type), labels: makeLabelForServices(type),
...defaultComposeConfiguration(network), ...defaultComposeConfiguration(network),
} }
console.log(config[s].image)
// Generate files for builds // Generate files for builds
if (template.services[s]?.files?.length > 0) { if (template.services[s]?.files?.length > 0) {

View File

@ -8,7 +8,7 @@
</script> </script>
{#if linkToDocs} {#if linkToDocs}
<DocLink url={template[service.id].documentation} text={`Documentation`} isExternal={true} /> <DocLink url={template[service.id]?.documentation || 'https://docs.coollabs.io'} text={`Documentation`} isExternal={true} />
{:else} {:else}
<ServiceIcons type={service.type} /> <ServiceIcons type={service.type} />
{/if} {/if}

View File

@ -276,20 +276,25 @@
</div> </div>
<div class="grid grid-cols-2 items-center"> <div class="grid grid-cols-2 items-center">
<label for="version">Version / Tag</label> <label for="version">Version / Tag</label>
<div class="custom-select-wrapper w-full"> {#if tags.tags?.length > 0}
<Select <div class="custom-select-wrapper w-full">
form="saveForm" <Select
containerClasses={isDisabled && containerClass()} form="saveForm"
{isDisabled} containerClasses={isDisabled && containerClass()}
id="version" {isDisabled}
showIndicator={!isDisabled} id="version"
items={[...tags.tags]} showIndicator={!isDisabled}
on:select={selectTag} items={[...tags.tags]}
value={service.version} on:select={selectTag}
isClearable={false} value={service.version}
/> isClearable={false}
</div> />
</div>
{:else}
<input class="w-full border-red-500" disabled placeholder="Error getting tags...">
{/if}
</div> </div>
<div class="grid grid-cols-2 items-center"> <div class="grid grid-cols-2 items-center">
<label for="destination">{$t('application.destination')}</label> <label for="destination">{$t('application.destination')}</label>
<div> <div>

View File

@ -1,7 +1,7 @@
{ {
"name": "coolify", "name": "coolify",
"description": "An open-source & self-hostable Heroku / Netlify alternative.", "description": "An open-source & self-hostable Heroku / Netlify alternative.",
"version": "3.11.5", "version": "3.11.6",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "github:coollabsio/coolify", "repository": "github:coollabsio/coolify",
"scripts": { "scripts": {