From b4ebd8425f531076ddea6d0a689daac34d65a5fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enol=20Fern=C3=A1ndez?= <enol.fernandez@egi.eu>
Date: Fri, 7 Jun 2024 13:54:24 +0100
Subject: [PATCH] Fix deployment issues from last PR (#50)

* Fix deployment issues from last PR

* use the proper openstack logo
---
 cron-update-endpoints             |   2 +-
 dashboard/dashy_endpoints.py      |  28 ++++++++++++++--------------
 docker-compose.yaml               |   8 ++------
 icons/openstack.ico               | Bin 338 -> 0 bytes
 {icons => user-data}/egi-logo.svg |   0
 5 files changed, 17 insertions(+), 21 deletions(-)
 delete mode 100644 icons/openstack.ico
 rename {icons => user-data}/egi-logo.svg (100%)

diff --git a/cron-update-endpoints b/cron-update-endpoints
index 4899260..ece69cf 100644
--- a/cron-update-endpoints
+++ b/cron-update-endpoints
@@ -1 +1 @@
-*/15 * * * * root /usr/local/bin/python /fedcloud-dashboard/dashboard/dashy_endpoints.py > /app/public/conf.yml
+*/15 * * * * root /usr/local/bin/python /fedcloud-dashboard/dashboard/dashy_endpoints.py > /app/user-data/conf.yml
diff --git a/dashboard/dashy_endpoints.py b/dashboard/dashy_endpoints.py
index aa65709..63cffa9 100644
--- a/dashboard/dashy_endpoints.py
+++ b/dashboard/dashy_endpoints.py
@@ -11,10 +11,6 @@
 import yaml
 from defusedxml import ElementTree
 
-DEFAULT_ICON = (
-    "https://github.com/openstack/openstackdocstheme/blob/master"
-    "/openstackdocstheme/theme/openstackdocs/static/favicon.ico?raw=true"
-)
 GOCDB_PUBLICURL = "https://goc.egi.eu/gocdbpi/public/"
 DOCS_URL = "https://docs.egi.eu/users/compute/cloud-compute/openstack/"
 TIMEOUT = 10
@@ -104,7 +100,7 @@ def main():
                     "path": DOCS_URL,
                 }
             ],
-            "logo": "egi-logo.svg",
+            "logo": "/egi-logo.svg",
         },
         "appConfig": {
             "theme": "material",
@@ -114,15 +110,19 @@ def main():
             "disableConfiguration": True,
         },
         "sections": [
-            {"name": "OpenStack Dashboards", "icon": "fas fa-clouds", "items": []}
+            {
+                "name": "OpenStack Dashboards",
+                "icon": "fas fa-clouds",
+                "items": [],
+                "displayData": {
+                    "sortBy": "alphabetical",
+                    "rows": 1,
+                    "cols": 1,
+                    "collapsed": False,
+                    "hideForGuests": False,
+                },
+            },
         ],
-        "displayData": {
-            "sortBy": "alphabetical",
-            "rows": 1,
-            "cols": 1,
-            "collapsed": False,
-            "hideForGuests": False,
-        },
     }
     try:
         endpoints = find_endpoints("org.openstack.horizon")
@@ -132,7 +132,7 @@ def main():
                 {
                     "title": s[0],
                     "description": f"{s[3]} ({s[4]})",
-                    "icon": "openstack.ico",
+                    "icon": "openstack.png",
                     "url": s[2],
                     "target": "newtab",
                 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
index bde1bd1..6ca631e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -40,8 +40,7 @@ services:
       - "traefik.http.routers.dashboard.entrypoints=websecure"
       - "traefik.http.routers.dashboard.tls.certresolver=myresolver"
     volumes:
-      - "config:/app/public"
-      - "/fedcloud-dashboard/icons:/app/user-data/item-icons/"
+      - "/fedcloud-dashboard/user-data:/app/user-data/"
     deploy:
       restart_policy:
         condition: any
@@ -49,14 +48,11 @@ services:
   endpoint_updater:
     build: .
     volumes:
-      - "config:/app/public"
+      - "/fedcloud-dashboard/user-data:/app/user-data/"
     deploy:
       restart_policy:
         condition: any
 
-volumes:
-  config:
-
 networks:
   default:
     driver: bridge
diff --git a/icons/openstack.ico b/icons/openstack.ico
deleted file mode 100644
index 869705dd6d8414adf026ba20e815a9c227c98055..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy;Q>A&u6L!3Xn`8GYcv6^kSPiB
z3ua&u5>qm;jfl$0%_}G@F6o~zaruVLM^Bvm`RkvW;EHgdx;{@A$B>F!TPL67Yf#{E
zIbQ2rD1P++e?Q+2_Sq*YE|kyN(=u(F!<5(080We>*sT3Fv9#;r?Yqry4d2J5>C`3u
z^t*AU;&6_W#Gwan790zk7VK(S6Q*9O)OzHpq{gaj|6L)^R-P8^sa`$B>19!|Xr#wN
zf!IHq7nCw*i~PD;5|Mx0SNz%erAynL{rlzgt^YGCZE|^Pu&H$y&}9ssu6{1-oD!M<
DJVc2F

diff --git a/icons/egi-logo.svg b/user-data/egi-logo.svg
similarity index 100%
rename from icons/egi-logo.svg
rename to user-data/egi-logo.svg