Merge pull request #534 from coollabsio/next

v3.3.2
This commit is contained in:
Andras Bacsai 2022-08-12 18:32:12 +02:00 committed by GitHub
commit 0745a12e7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 9 deletions

View File

@ -17,7 +17,7 @@ import { checkContainer, removeContainer } from './docker';
import { day } from './dayjs'; import { day } from './dayjs';
import * as serviceFields from './serviceFields' import * as serviceFields from './serviceFields'
export const version = '3.3.1'; export const version = '3.3.2';
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

@ -23,7 +23,7 @@
import { get, post } from '$lib/api'; import { get, post } from '$lib/api';
import Usage from '$lib/components/Usage.svelte'; import Usage from '$lib/components/Usage.svelte';
import { t } from '$lib/translations'; import { t } from '$lib/translations';
import { errorNotification } from '$lib/common'; import { errorNotification, asyncSleep } from '$lib/common';
import { addToast, appSession } from '$lib/store'; import { addToast, appSession } from '$lib/store';
import ApplicationsIcons from '$lib/components/svg/applications/ApplicationIcons.svelte'; import ApplicationsIcons from '$lib/components/svg/applications/ApplicationIcons.svelte';
@ -37,8 +37,18 @@
export let applications: any; export let applications: any;
export let databases: any; export let databases: any;
export let services: any; export let services: any;
let numberOfGetStatus = 0;
function getRndInteger(min, max) {
return Math.floor(Math.random() * (max - min + 1) ) + min;
}
async function getStatus(resources: any) { async function getStatus(resources: any) {
while (numberOfGetStatus > 1){
await asyncSleep(getRndInteger(100,200));
}
try { try {
numberOfGetStatus++;
const { id, buildPack, dualCerts } = resources; const { id, buildPack, dualCerts } = resources;
let isRunning = false; let isRunning = false;
if (buildPack) { if (buildPack) {
@ -58,6 +68,8 @@
} }
} catch (error) { } catch (error) {
return 'Error'; return 'Error';
} finally {
numberOfGetStatus--;
} }
} }
async function manuallyCleanupStorage() { async function manuallyCleanupStorage() {
@ -82,7 +94,6 @@
>Cleanup Storage</button >Cleanup Storage</button
> >
</div> </div>
<div class="mt-10 pb-12 tracking-tight sm:pb-16"> <div class="mt-10 pb-12 tracking-tight sm:pb-16">
<div class="mx-auto px-10"> <div class="mx-auto px-10">
<div class="flex flex-col justify-center xl:flex-row"> <div class="flex flex-col justify-center xl:flex-row">
@ -113,7 +124,7 @@
Application Application
</div></td </div></td
> >
<td> <td class="flex justify-end">
{#if application.fqdn} {#if application.fqdn}
<a <a
href={application.fqdn} href={application.fqdn}
@ -189,7 +200,7 @@
</div> </div>
</td> </td>
<td> <td class="flex justify-end">
{#if service.fqdn} {#if service.fqdn}
<a <a
href={service.fqdn} href={service.fqdn}
@ -263,7 +274,7 @@
Database Database
</div> </div>
</td> </td>
<td> <td class="flex justify-end">
<a <a
href={`/databases/${database.id}`} href={`/databases/${database.id}`}
class="icons bg-transparent text-sm inline-flex ml-11" class="icons bg-transparent text-sm inline-flex ml-11"

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.3.1", "version": "3.3.2",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "github:coollabsio/coolify", "repository": "github:coollabsio/coolify",
"scripts": { "scripts": {