Browse Source

Merge a1fd655adab8d7f68fa9abc70019d88f7043126c into 3c347c854c4c55456785ff026a703422d8f02f62

James Cross 1 năm trước cách đây
mục cha
commit
0857dc098f

+ 3 - 0
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

+ 5 - 0
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]
           });
         }
       }

+ 1 - 0
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']
         });
       }
     }