From c7587a1c036f73d9ed71b4cf6a05811ce7fa94bc Mon Sep 17 00:00:00 2001 From: James Cross Date: Mon, 16 May 2022 11:36:47 +0100 Subject: [PATCH 1/3] Add flame.description to docker label --- controllers/apps/docker/useDocker.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controllers/apps/docker/useDocker.js b/controllers/apps/docker/useDocker.js index 88ecb3e..f0764bd 100644 --- a/controllers/apps/docker/useDocker.js +++ b/controllers/apps/docker/useDocker.js @@ -91,16 +91,21 @@ const useDocker = async (apps) => { for (let i = 0; i < labels['flame.name'].split(';').length; i++) { const names = labels['flame.name'].split(';'); const urls = labels['flame.url'].split(';'); + let descriptions = ''; let icons = ''; if ('flame.icon' in labels) { icons = labels['flame.icon'].split(';'); } + if ('flame.description' in labels) { + descriptions = labels['flame.description'].split(';'); + } dockerApps.push({ name: names[i] || names[0], url: urls[i] || urls[0], icon: icons[i] || 'docker', + description: descriptions[i] || descriptions[0] }); } } From 120bee63a3005eff22a8bc5bb0401c8b8f4d07f0 Mon Sep 17 00:00:00 2001 From: James Cross Date: Mon, 16 May 2022 11:37:06 +0100 Subject: [PATCH 2/3] Add flame.pawelmalak/description to kubernetes integration --- controllers/apps/docker/useKubernetes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/apps/docker/useKubernetes.js b/controllers/apps/docker/useKubernetes.js index d9961cd..9abb78c 100644 --- a/controllers/apps/docker/useKubernetes.js +++ b/controllers/apps/docker/useKubernetes.js @@ -43,6 +43,7 @@ const useKubernetes = async (apps) => { name: annotations['flame.pawelmalak/name'], url: annotations['flame.pawelmalak/url'], icon: annotations['flame.pawelmalak/icon'] || 'kubernetes', + description: annotations['flame.pawelmalak/description'] }); } } From a1fd655adab8d7f68fa9abc70019d88f7043126c Mon Sep 17 00:00:00 2001 From: James Cross Date: Mon, 16 May 2022 11:37:12 +0100 Subject: [PATCH 3/3] Update documentation --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a8424c9..0ac47b4 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,7 @@ labels: - flame.url=https://example.com - flame.icon=icon-name # optional, default is "docker" # - flame.icon=custom to make changes in app. ie: custom icon upload + - flame.description=A description ``` > "Use Docker API" option must be enabled for this to work. You can find it in Settings > Docker @@ -187,6 +188,7 @@ labels: - flame.name=First App;Second App - flame.url=https://example1.com;https://example2.com - flame.icon=icon-name1;icon-name2 + - flame.description=First description;Second description ``` If you want to use a remote docker host follow this instructions in the host: @@ -223,6 +225,7 @@ metadata: - flame.pawelmalak/name=My container - flame.pawelmalak/url=https://example.com - flame.pawelmalak/icon=icon-name # optional, default is "kubernetes" + - flame.pawelmalak/description=A description ``` > "Use Kubernetes Ingress API" option must be enabled for this to work. You can find it in Settings > Docker