From 300b28c0f25f0f56979f6903c360fc0d78e0bb93 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 11 Sep 2022 12:11:48 +0000 Subject: [PATCH 1/2] move reset queue button to build logs --- .../api/src/lib/services/supportedVersions.ts | 237 ++---------------- .../applications/[id]/logs/build.svelte | 17 +- 2 files changed, 32 insertions(+), 222 deletions(-) diff --git a/apps/api/src/lib/services/supportedVersions.ts b/apps/api/src/lib/services/supportedVersions.ts index 145d7395b..3de1ecd1a 100644 --- a/apps/api/src/lib/services/supportedVersions.ts +++ b/apps/api/src/lib/services/supportedVersions.ts @@ -1,215 +1,22 @@ -export const supportedServiceTypesAndVersions = [ - { - name: 'plausibleanalytics', - fancyName: 'Plausible Analytics', - baseImage: 'plausible/analytics', - images: ['bitnami/postgresql:13.2.0', 'yandex/clickhouse-server:21.3.2.5'], - versions: ['latest', 'stable'], - recommendedVersion: 'stable', - ports: { - main: 8000 - } - }, - { - name: 'nocodb', - fancyName: 'NocoDB', - baseImage: 'nocodb/nocodb', - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 8080 - } - }, - { - name: 'minio', - fancyName: 'MinIO', - baseImage: 'minio/minio', - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 9001 - } - }, - { - name: 'vscodeserver', - fancyName: 'VSCode Server', - baseImage: 'codercom/code-server', - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 8080 - } - }, - { - name: 'wordpress', - fancyName: 'Wordpress', - baseImage: 'wordpress', - images: ['bitnami/mysql:5.7'], - versions: ['latest', 'php8.1', 'php8.0', 'php7.4', 'php7.3'], - recommendedVersion: 'latest', - ports: { - main: 80 - } - }, - { - name: 'vaultwarden', - fancyName: 'Vaultwarden', - baseImage: 'vaultwarden/server', - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 80 - } - }, - { - name: 'languagetool', - fancyName: 'LanguageTool', - baseImage: 'silviof/docker-languagetool', - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 8010 - } - }, - { - name: 'n8n', - fancyName: 'n8n', - baseImage: 'n8nio/n8n', - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 5678 - } - }, - { - name: 'uptimekuma', - fancyName: 'Uptime Kuma', - baseImage: 'louislam/uptime-kuma', - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 3001 - } - }, - { - name: 'ghost', - fancyName: 'Ghost', - baseImage: 'bitnami/ghost', - images: ['bitnami/mariadb'], - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 2368 - } - }, - { - name: 'meilisearch', - fancyName: 'Meilisearch', - baseImage: 'getmeili/meilisearch', - images: [], - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 7700 - } - }, - { - name: 'umami', - fancyName: 'Umami', - baseImage: 'ghcr.io/mikecao/umami', - images: ['postgres:12-alpine'], - versions: ['postgresql-latest'], - recommendedVersion: 'postgresql-latest', - ports: { - main: 3000 - } - }, - { - name: 'hasura', - fancyName: 'Hasura', - baseImage: 'hasura/graphql-engine', - images: ['postgres:12-alpine'], - versions: ['latest', 'v2.10.0', 'v2.5.1'], - recommendedVersion: 'v2.10.0', - ports: { - main: 8080 - } - }, - { - name: 'fider', - fancyName: 'Fider', - baseImage: 'getfider/fider', - images: ['postgres:12-alpine'], - versions: ['stable'], - recommendedVersion: 'stable', - ports: { - main: 3000 - } - }, - { - name: 'appwrite', - fancyName: 'Appwrite', - baseImage: 'appwrite/appwrite', - images: ['mariadb:10.7', 'redis:6.2-alpine', 'appwrite/telegraf:1.4.0'], - versions: ['latest', '0.15.3'], - recommendedVersion: '0.15.3', - ports: { - main: 80 - } - }, - // { - // name: 'moodle', - // fancyName: 'Moodle', - // baseImage: 'bitnami/moodle', - // images: [], - // versions: ['latest', 'v4.0.2'], - // recommendedVersion: 'latest', - // ports: { - // main: 8080 - // } - // } - { - name: 'glitchTip', - fancyName: 'GlitchTip', - baseImage: 'glitchtip/glitchtip', - images: ['postgres:14-alpine', 'redis:7-alpine'], - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 8000 - } - }, - { - name: 'searxng', - fancyName: 'SearXNG', - baseImage: 'searxng/searxng', - images: [], - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 8080 - } - }, - { - name: 'weblate', - fancyName: 'Weblate', - baseImage: 'weblate/weblate', - images: ['postgres:14-alpine', 'redis:6-alpine'], - versions: ['latest'], - recommendedVersion: 'latest', - ports: { - main: 8080 - } - }, - // { - // name: 'taiga', - // fancyName: 'Taiga', - // baseImage: 'taigaio/taiga-front', - // images: ['postgres:12.3', 'rabbitmq:3.8-management-alpine', 'taigaio/taiga-back', 'taigaio/taiga-events', 'taigaio/taiga-protected'], - // versions: ['latest'], - // recommendedVersion: 'latest', - // ports: { - // main: 80 - // } - // }, -]; \ No newline at end of file + +< + + + +> + + + + + + + + + + + + +fdfdkspfodskfdposfdkpokopoo + + +ffffdsfds \ No newline at end of file diff --git a/apps/ui/src/routes/applications/[id]/logs/build.svelte b/apps/ui/src/routes/applications/[id]/logs/build.svelte index 6999f53f0..de5d60c35 100644 --- a/apps/ui/src/routes/applications/[id]/logs/build.svelte +++ b/apps/ui/src/routes/applications/[id]/logs/build.svelte @@ -28,7 +28,7 @@ import {addToast} from '$lib/store'; import BuildLog from './_BuildLog.svelte'; import { get, post } from '$lib/api'; import { t } from '$lib/translations'; - import { changeQueryParams, dateOptions, errorNotification } from '$lib/common'; + import { changeQueryParams, dateOptions, errorNotification, asyncSleep } from '$lib/common'; import Tooltip from '$lib/components/Tooltip.svelte'; let buildId: any; @@ -85,7 +85,7 @@ import {addToast} from '$lib/store'; return changeQueryParams(buildId); } async function resetQueue() { - const sure = confirm('It will reset all build queues for all applications. If something is queued, it will be canceled automatically. Are you sure? '); + const sure = confirm('It will reset all build queues for all applications. If something is queued, it will be canceled automatically. Are you sure? '); if (sure) { try { @@ -94,6 +94,8 @@ import {addToast} from '$lib/store'; message: 'Queue reset done.', type: 'success' }); + await asyncSleep(500) + return window.location.reload() } catch (error) { return errorNotification(error); } @@ -162,12 +164,8 @@ import {addToast} from '$lib/store'; on:click={() => loadBuild(build.id)} class:rounded-tr={index === 0} class:rounded-br={index === builds.length - 1} - class="flex cursor-pointer items-center justify-center border-l-2 py-4 no-underline transition-all duration-100 hover:bg-coolgray-400 hover:shadow-xl" + class="flex cursor-pointer items-center justify-center py-4 no-underline transition-all duration-100 hover:bg-coolgray-400 hover:shadow-xl" class:bg-coolgray-400={buildId === build.id} - class:border-red-500={build.status === 'failed'} - class:border-orange-500={build.status === 'canceled'} - class:border-green-500={build.status === 'success'} - class:border-yellow-500={build.status === 'running'} >
@@ -176,6 +174,11 @@ import {addToast} from '$lib/store';
{build.type}
+
{build.status}
From 1670fe9b1cdca334448123326ce81f44055affe8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 11 Sep 2022 12:14:27 +0000 Subject: [PATCH 2/2] Update supportedVersions.ts --- .../api/src/lib/services/supportedVersions.ts | 237 ++++++++++++++++-- 1 file changed, 215 insertions(+), 22 deletions(-) diff --git a/apps/api/src/lib/services/supportedVersions.ts b/apps/api/src/lib/services/supportedVersions.ts index 3de1ecd1a..9a82b08a0 100644 --- a/apps/api/src/lib/services/supportedVersions.ts +++ b/apps/api/src/lib/services/supportedVersions.ts @@ -1,22 +1,215 @@ - -< - - - -> - - - - - - - - - - - - -fdfdkspfodskfdposfdkpokopoo - - -ffffdsfds \ No newline at end of file +export const supportedServiceTypesAndVersions = [ + { + name: "plausibleanalytics", + fancyName: "Plausible Analytics", + baseImage: "plausible/analytics", + images: ["bitnami/postgresql:13.2.0", "yandex/clickhouse-server:21.3.2.5"], + versions: ["latest", "stable"], + recommendedVersion: "stable", + ports: { + main: 8000, + }, + }, + { + name: "nocodb", + fancyName: "NocoDB", + baseImage: "nocodb/nocodb", + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 8080, + }, + }, + { + name: "minio", + fancyName: "MinIO", + baseImage: "minio/minio", + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 9001, + }, + }, + { + name: "vscodeserver", + fancyName: "VSCode Server", + baseImage: "codercom/code-server", + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 8080, + }, + }, + { + name: "wordpress", + fancyName: "Wordpress", + baseImage: "wordpress", + images: ["bitnami/mysql:5.7"], + versions: ["latest", "php8.1", "php8.0", "php7.4", "php7.3"], + recommendedVersion: "latest", + ports: { + main: 80, + }, + }, + { + name: "vaultwarden", + fancyName: "Vaultwarden", + baseImage: "vaultwarden/server", + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 80, + }, + }, + { + name: "languagetool", + fancyName: "LanguageTool", + baseImage: "silviof/docker-languagetool", + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 8010, + }, + }, + { + name: "n8n", + fancyName: "n8n", + baseImage: "n8nio/n8n", + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 5678, + }, + }, + { + name: "uptimekuma", + fancyName: "Uptime Kuma", + baseImage: "louislam/uptime-kuma", + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 3001, + }, + }, + { + name: "ghost", + fancyName: "Ghost", + baseImage: "bitnami/ghost", + images: ["bitnami/mariadb"], + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 2368, + }, + }, + { + name: "meilisearch", + fancyName: "Meilisearch", + baseImage: "getmeili/meilisearch", + images: [], + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 7700, + }, + }, + { + name: "umami", + fancyName: "Umami", + baseImage: "ghcr.io/mikecao/umami", + images: ["postgres:12-alpine"], + versions: ["postgresql-latest"], + recommendedVersion: "postgresql-latest", + ports: { + main: 3000, + }, + }, + { + name: "hasura", + fancyName: "Hasura", + baseImage: "hasura/graphql-engine", + images: ["postgres:12-alpine"], + versions: ["latest", "v2.10.0", "v2.5.1"], + recommendedVersion: "v2.10.0", + ports: { + main: 8080, + }, + }, + { + name: "fider", + fancyName: "Fider", + baseImage: "getfider/fider", + images: ["postgres:12-alpine"], + versions: ["stable"], + recommendedVersion: "stable", + ports: { + main: 3000, + }, + }, + { + name: "appwrite", + fancyName: "Appwrite", + baseImage: "appwrite/appwrite", + images: ["mariadb:10.7", "redis:6.2-alpine", "appwrite/telegraf:1.4.0"], + versions: ["latest", "0.15.3"], + recommendedVersion: "0.15.3", + ports: { + main: 80, + }, + }, + // { + // name: 'moodle', + // fancyName: 'Moodle', + // baseImage: 'bitnami/moodle', + // images: [], + // versions: ['latest', 'v4.0.2'], + // recommendedVersion: 'latest', + // ports: { + // main: 8080 + // } + // } + { + name: "glitchTip", + fancyName: "GlitchTip", + baseImage: "glitchtip/glitchtip", + images: ["postgres:14-alpine", "redis:7-alpine"], + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 8000, + }, + }, + { + name: "searxng", + fancyName: "SearXNG", + baseImage: "searxng/searxng", + images: [], + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 8080, + }, + }, + { + name: "weblate", + fancyName: "Weblate", + baseImage: "weblate/weblate", + images: ["postgres:14-alpine", "redis:6-alpine"], + versions: ["latest"], + recommendedVersion: "latest", + ports: { + main: 8080, + }, + }, + // { + // name: 'taiga', + // fancyName: 'Taiga', + // baseImage: 'taigaio/taiga-front', + // images: ['postgres:12.3', 'rabbitmq:3.8-management-alpine', 'taigaio/taiga-back', 'taigaio/taiga-events', 'taigaio/taiga-protected'], + // versions: ['latest'], + // recommendedVersion: 'latest', + // ports: { + // main: 80 + // } + // }, +];